diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 3a7e415077..07dd7041c2 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# Get 'SERVERPROGS', 'OTHERPROGS', '<target>_SOURCES' variables, 'CURLX_SRCS', 'USEFUL', 'INET_PTON', 'UTIL', 'UTIL_BUNDLE'
+# Get 'SERVERPROGS', '<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")
 
@@ -46,7 +46,7 @@ if(CURL_TEST_BUNDLES)
   list(APPEND servers_SOURCES ${CURLX_SRCS} ${USEFUL} ${INET_PTON} ${UTIL} ${UTIL_BUNDLE})
 endif()
 
-foreach(_target IN LISTS SERVERPROGS OTHERPROGS)
+foreach(_target IN LISTS SERVERPROGS)
   set(_target_name "${_target}")
   add_executable(${_target_name} EXCLUDE_FROM_ALL ${${_target}_SOURCES})
   add_dependencies(testdeps ${_target_name})
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index e1a9385f8a..14b334a1e4 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -57,14 +57,14 @@ if USE_TEST_BUNDLES
 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)
+noinst_PROGRAMS = servers
 nodist_servers_SOURCES = server_bundle.c
 servers_SOURCES = $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
 servers_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 servers_CFLAGS = $(AM_CFLAGS)
 CLEANFILES = server_bundle.c
 else
-noinst_PROGRAMS = $(SERVERPROGS) $(OTHERPROGS)
+noinst_PROGRAMS = $(SERVERPROGS)
 endif
 
 CHECKSRC = $(CS_$(V))
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index b6f78c347a..9eb37195a1 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -22,8 +22,7 @@
 #
 ###########################################################################
 
-SERVERPROGS = rtspd sockfilt sws tftpd socksd disabled mqttd
-OTHERPROGS = resolve
+SERVERPROGS = resolve rtspd sockfilt sws tftpd socksd disabled mqttd
 
 CURLX_SRCS = \
  ../../lib/mprintf.c \
diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm
index 81c3adb183..89cca15dc9 100644
--- a/tests/serverhelp.pm
+++ b/tests/serverhelp.pm
@@ -245,7 +245,7 @@ sub server_exe {
         $ext = 'SRV';
     }
     my $cmd;
-    if($ENV{'CURL_TEST_BUNDLES'} && $name ne 'resolve') {
+    if($ENV{'CURL_TEST_BUNDLES'}) {
         $cmd = $SRVDIR . "servers" . exe_ext($ext) . " $name";
     }
     else {
@@ -264,7 +264,7 @@ sub server_exe_args {
         $ext = 'SRV';
     }
     my @cmd;
-    if($ENV{'CURL_TEST_BUNDLES'} && $name ne 'resolve') {
+    if($ENV{'CURL_TEST_BUNDLES'}) {
         @cmd = ($SRVDIR . "servers" . exe_ext($ext), $name);
     }
     else {