diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index c33532fc7c..a93b2d1bf6 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -40,6 +40,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 
+CFLAGS += @CURL_CFLAG_EXTRAS@
+
 if DOING_NATIVE_WINDOWS
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index 9052f69443..27c9c2aa57 100644
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -173,15 +173,7 @@ static unsigned short shortval(char *value)
   return num & 0xffff;
 }
 
-static enum {
-  socket_domain_inet = AF_INET
-#ifdef USE_IPV6
-  , socket_domain_inet6 = AF_INET6
-#endif
-#ifdef USE_UNIX_SOCKETS
-  , socket_domain_unix = AF_UNIX
-#endif
-} socket_domain = AF_INET;
+static int socket_domain = AF_INET;
 
 static void getconfig(void)
 {
diff --git a/tests/server/sws.c b/tests/server/sws.c
index e6aefe3e94..3763410ee0 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -65,15 +65,7 @@
 #define ERANGE  34 /* errno.h value */
 #endif
 
-static enum {
-  socket_domain_inet = AF_INET
-#ifdef USE_IPV6
-  , socket_domain_inet6 = AF_INET6
-#endif
-#ifdef USE_UNIX_SOCKETS
-  , socket_domain_unix = AF_UNIX
-#endif
-} socket_domain = AF_INET;
+static int socket_domain = AF_INET;
 static bool use_gopher = FALSE;
 static int serverlogslocked = 0;
 static bool is_proxy = FALSE;