diff --git a/tests/ampctld.c b/tests/ampctld.c
index 12b6e2a54..208d0b5f4 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -568,7 +568,7 @@ int main(int argc, char *argv[])
                                    sizeof(host),
                                    serv,
                                    sizeof(serv),
-                                   NI_NOFQDN))
+                                   NI_NUMERICHOST|NI_NUMERICSERV))
                 < 0)
         {
 
@@ -674,7 +674,7 @@ void *handle_socket(void *arg)
                                sizeof(host),
                                serv,
                                sizeof(serv),
-                               NI_NOFQDN))
+                               NI_NUMERICHOST|NI_NUMERICSERV))
             < 0)
     {
 
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 391106295..6c956e75f 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -963,7 +963,7 @@ int main(int argc, char *argv[])
                                        sizeof(host),
                                        serv,
                                        sizeof(serv),
-                                       NI_NOFQDN))
+                                       NI_NUMERICHOST|NI_NUMERICSERV))
                     < 0)
             {
                 rig_debug(RIG_DEBUG_WARN,
@@ -1201,7 +1201,7 @@ void *handle_socket(void *arg)
                                sizeof(host),
                                serv,
                                sizeof(serv),
-                               NI_NOFQDN))
+                               NI_NUMERICHOST|NI_NUMERICSERV))
             < 0)
     {
 
diff --git a/tests/rotctld.c b/tests/rotctld.c
index 19b12ce3b..ecbca0e6a 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -598,7 +598,7 @@ int main(int argc, char *argv[])
                                    sizeof(host),
                                    serv,
                                    sizeof(serv),
-                                   NI_NOFQDN))
+                                   NI_NUMERICHOST|NI_NUMERICSERV))
                 < 0)
         {
 
@@ -711,7 +711,7 @@ void *handle_socket(void *arg)
                                sizeof(host),
                                serv,
                                sizeof(serv),
-                               NI_NOFQDN))
+                               NI_NUMERICHOST|NI_NUMERICSERV))
             < 0)
     {