diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 227dce769b..05f83af868 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -40,14 +40,14 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
     ${FIRSTFILES} ${_bundle_extra} ${TESTFILES}
   VERBATIM)
 
-add_executable(clients EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
-add_dependencies(testdeps clients)
-target_include_directories(clients PRIVATE
+add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
+add_dependencies(testdeps ${BUNDLE})
+target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
   "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for "first.h"
 )
-target_link_libraries(clients ${LIB_SELECTED} ${CURL_LIBS})
-set_property(TARGET clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
-set_target_properties(clients PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
+target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
+set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 2bd484b401..26138a3c9e 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -47,9 +47,9 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
     ${FIRSTFILES} ${UTILS} ${_bundle_extra} ${TESTFILES} "lib1521.c"
   VERBATIM)
 
-add_executable(libtests EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
-add_dependencies(testdeps libtests)
-target_include_directories(libtests PRIVATE
+add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
+add_dependencies(testdeps ${BUNDLE})
+target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
   "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
@@ -57,6 +57,7 @@ target_include_directories(libtests PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # to be able to build generated tests
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for curlcheck.h
 )
-target_link_libraries(libtests ${LIB_SELECTED} ${CURL_LIBS})
-set_property(TARGET libtests APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}" "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
-set_target_properties(libtests PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
+target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
+set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index ff578f38bd..d95a648303 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -35,17 +35,18 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
     ${FIRSTFILES} ${UTILS} ${CURLX_SRCS} ${TESTFILES}
   VERBATIM)
 
-add_executable(servers EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
-add_dependencies(testdeps servers)
-target_include_directories(servers PRIVATE
+add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
+add_dependencies(testdeps ${BUNDLE})
+target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"           # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"           # for "curl_setup.h"
   "${PROJECT_SOURCE_DIR}/lib/curlx"     # for curlx
   "${PROJECT_SOURCE_DIR}/src"           # for "tool_binmode.h", "tool_xattr.h"
   "${PROJECT_SOURCE_DIR}/tests/server"  # for "first.h"
 )
-target_link_libraries(servers ${CURL_LIBS})
-set_property(TARGET servers APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL" "CURL_NO_OLDIES")
+target_link_libraries(${BUNDLE} ${CURL_LIBS})
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
 # Test servers simply are standalone programs that do not use libcurl
 # library.  For convenience and to ease portability of these servers,
 # some source code files from the libcurl subdirectory are also used
@@ -53,6 +54,6 @@ set_property(TARGET servers APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL
 # files on Windows targets it is necessary to build the test servers
 # with CURL_STATICLIB defined, independently of how libcurl is built.
 if(WIN32)
-  set_property(TARGET servers APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB")
+  set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB")
 endif()
-set_target_properties(servers PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
+set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 8b7d5f29d8..c8b8408807 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -50,10 +50,11 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 
+AM_CPPFLAGS += -DWITHOUT_LIBCURL
+AM_CPPFLAGS += -DCURL_NO_OLDIES
 if DOING_NATIVE_WINDOWS
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
-AM_CPPFLAGS += -DWITHOUT_LIBCURL -DCURL_NO_OLDIES
 
 $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(CURLX_SRCS) $(TESTFILES)
 	@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(CURLX_SRCS) --test $(TESTFILES) > $(BUNDLE_SRC)
diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index b58022d7e9..0ba777ba33 100644
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -33,10 +33,10 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
     "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc" ${FIRSTFILES} ${TESTFILES}
   VERBATIM)
 
-add_executable(tunits EXCLUDE_FROM_ALL ${UTILS} "${BUNDLE_SRC}")
-add_dependencies(testdeps tunits)
-target_link_libraries(tunits curltool curlu)
-target_include_directories(tunits PRIVATE
+add_executable(${BUNDLE} EXCLUDE_FROM_ALL ${UTILS} "${BUNDLE_SRC}")
+add_dependencies(testdeps ${BUNDLE})
+target_link_libraries(${BUNDLE} curltool curlu)
+target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
   "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
@@ -45,5 +45,6 @@ target_include_directories(tunits PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for curlcheck.h
   "${PROJECT_SOURCE_DIR}/tests/tunit"
 )
-set_property(TARGET tunits APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}" "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
-set_target_properties(tunits PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
+set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index be1893d002..1b9d2f1be3 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -33,10 +33,10 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
     "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc" ${FIRSTFILES} ${TESTFILES}
   VERBATIM)
 
-add_executable(units EXCLUDE_FROM_ALL ${UTILS} "${BUNDLE_SRC}")
-add_dependencies(testdeps units)
-target_link_libraries(units curltool curlu)
-target_include_directories(units PRIVATE
+add_executable(${BUNDLE} EXCLUDE_FROM_ALL ${UTILS} "${BUNDLE_SRC}")
+add_dependencies(testdeps ${BUNDLE})
+target_link_libraries(${BUNDLE} curltool curlu)
+target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
   "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
@@ -44,6 +44,8 @@ target_include_directories(units PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/libtest"
   "${PROJECT_SOURCE_DIR}/tests/unit"
 )
-set_property(TARGET units APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}" "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
-set_property(TARGET units APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL")  # unit tests are small pretend-libcurl-programs
-set_target_properties(units PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
+# unit tests are small pretend-libcurl-programs
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL")
+set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8dd3f42fea..e50b33e952 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -50,7 +50,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 
-AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS -DBUILDING_LIBCURL
+AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
 if DEBUGBUILD
 AM_CPPFLAGS += -DDEBUGBUILD
 endif
@@ -58,6 +58,7 @@ if CURLDEBUG
 AM_CPPFLAGS += -DCURLDEBUG
 endif
 AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
+AM_CPPFLAGS += -DBUILDING_LIBCURL
 
 if BUILD_UNITTESTS
 $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(TESTFILES)