diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 2282f8f155..017ca4bbc5 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# Get 'SERVERPROGS', 'OTHERPROGS', '<target>_SOURCES' variables, 'CURLX_SRCS', 'USEFUL', 'UTIL', 'UTIL_BUNDLE'
+# Get 'SERVERPROGS', 'OTHERPROGS', '<target>_SOURCES' variables, 'CURLX_SRCS', 'USEFUL', 'INET_PTON', 'UTIL', 'UTIL_BUNDLE'
 curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 
@@ -39,7 +39,7 @@ if(CURL_TEST_BUNDLES)
 
   set(SERVERPROGS "servers")
   set(servers_SOURCES "server_bundle.c")
-  list(APPEND servers_SOURCES ${CURLX_SRCS} ${USEFUL} ${UTIL} ${UTIL_BUNDLE})
+  list(APPEND servers_SOURCES ${CURLX_SRCS} ${USEFUL} ${INET_PTON} ${UTIL} ${UTIL_BUNDLE})
 endif()
 
 foreach(_target IN LISTS SERVERPROGS OTHERPROGS)
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 6e3d352ecf..fd1c07f649 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -54,12 +54,12 @@ include Makefile.inc
 EXTRA_DIST = base64.pl CMakeLists.txt .checksrc
 
 if USE_TEST_BUNDLES
-server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(UTIL) $(UTIL_BUNDLE)
+server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
 	@PERL@ $(top_srcdir)/tests/mk-bundle-server.pl $(SERVERPROGS) > server_bundle.c
 
 noinst_PROGRAMS = servers $(OTHERPROGS)
 nodist_servers_SOURCES = server_bundle.c
-servers_SOURCES = $(CURLX_SRCS) $(USEFUL) $(UTIL) $(UTIL_BUNDLE)
+servers_SOURCES = $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
 CLEANFILES = server_bundle.c
 else
 noinst_PROGRAMS = $(SERVERPROGS) $(OTHERPROGS)
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 2049c9364c..b6f78c347a 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -62,6 +62,9 @@ USEFUL = \
  ../../lib/memdebug.c \
  ../../lib/memdebug.h
 
+INET_PTON = \
+ ../../lib/inet_pton.c
+
 UTIL = \
  util.c \
  util.h \
@@ -83,29 +86,27 @@ rtspd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
 rtspd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 rtspd_CFLAGS = $(AM_CFLAGS)
 
-sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) $(INET_PTON) \
  server_sockaddr.h \
- sockfilt.c \
- ../../lib/inet_pton.c
+ sockfilt.c
 sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sockfilt_CFLAGS = $(AM_CFLAGS)
 
 socksd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
- server_sockaddr.h socksd.c \
- ../../lib/inet_pton.c
+ server_sockaddr.h \
+ socksd.c
 socksd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 socksd_CFLAGS = $(AM_CFLAGS)
 
-mqttd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
- server_sockaddr.h mqttd.c \
- ../../lib/inet_pton.c
+mqttd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) $(INET_PTON) \
+ server_sockaddr.h \
+ mqttd.c
 mqttd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 mqttd_CFLAGS = $(AM_CFLAGS)
 
-sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) $(INET_PTON) \
  server_sockaddr.h \
- sws.c \
- ../../lib/inet_pton.c
+ sws.c
 sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sws_CFLAGS = $(AM_CFLAGS)