diff --git a/.drone/drone.sh b/.drone/drone.sh
index b99f5f33f..c9186524d 100755
--- a/.drone/drone.sh
+++ b/.drone/drone.sh
@@ -231,28 +231,6 @@ elif [ "$DRONE_JOB_BUILDTYPE" == "valgrind" ]; then
   cd "$BOOST_ROOT/libs/$SELF"
   ci/travis/valgrind.sh
 
-elif [ "$DRONE_JOB_BUILDTYPE" == "standalone" ]; then
-
-  echo '==================================> INSTALL'
-
-  # Installing cmake with apt-get, so not required here:
-  # pip install --user cmake
-
-  echo '==================================> SCRIPT'
-
-  export CXXFLAGS="-Wall -Wextra -Werror -std=c++17"
-  mkdir __build_17
-  cd __build_17
-  cmake -DBOOST_JSON_STANDALONE=1 ..
-  cmake --build .
-  ctest -V .
-  export CXXFLAGS="-Wall -Wextra -Werror -std=c++2a"
-  mkdir ../__build_2a
-  cd ../__build_2a
-  cmake -DBOOST_JSON_STANDALONE=1 ..
-  cmake --build .
-  ctest -V .
-
 elif [ "$DRONE_JOB_BUILDTYPE" == "coverity" ]; then
 
   echo '==================================> INSTALL'
@@ -284,7 +262,7 @@ elif [ "$DRONE_JOB_BUILDTYPE" == "cmake-superproject" ]; then
   cd __build_static
   cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 \
     -DBOOST_INCLUDE_LIBRARIES="$SELF" ..
-  cmake --build .
+  cmake --build . --target tests
   ctest --output-on-failure -R "boost_$SELF"
 
   cd ..
@@ -293,7 +271,7 @@ elif [ "$DRONE_JOB_BUILDTYPE" == "cmake-superproject" ]; then
   cd __build_shared
   cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 \
     -DBOOST_INCLUDE_LIBRARIES="$SELF" -DBUILD_SHARED_LIBS=ON ..
-  cmake --build .
+  cmake --build . --target tests
   ctest --output-on-failure -R "boost_$SELF"
 
 elif [ "$DRONE_JOB_BUILDTYPE" == "cmake-install" ]; then
@@ -329,7 +307,7 @@ elif [ "$DRONE_JOB_BUILDTYPE" == "cmake-install" ]; then
   cd "libs/$SELF"
   mkdir __build__ && cd __build__
   cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
-  cmake --build . --target install
+  cmake --build . --target tests
   ctest --output-on-failure
 
   # CMake subdir tests
diff --git a/test/extra/CMakeLists.txt b/test/extra/CMakeLists.txt
index 44fe82145..8dcef7568 100644
--- a/test/extra/CMakeLists.txt
+++ b/test/extra/CMakeLists.txt
@@ -12,7 +12,7 @@
 set(TEST_FILES Jamfile test_suite.cpp)
 
 # Test target
-add_executable(boost_url_extra ${TEST_FILES} ${SUITE_FILES})
+add_executable(boost_url_extra EXCLUDE_FROM_ALL ${TEST_FILES} ${SUITE_FILES})
 target_include_directories(boost_url_extra PRIVATE . ../../extra)
 target_link_libraries(boost_url_extra PRIVATE Boost::url)
 
diff --git a/test/fuzz/CMakeLists.txt b/test/fuzz/CMakeLists.txt
index 0918f96f8..c092f61ce 100644
--- a/test/fuzz/CMakeLists.txt
+++ b/test/fuzz/CMakeLists.txt
@@ -74,7 +74,7 @@ target_link_libraries(boost_url_fuzz PRIVATE -fsanitize=fuzzer,address,undefined
 function(add_boost_url_fuzzer NAME)
     # Fuzzer executable
     set(SOURCE_FILES ${ARGN})
-    add_executable(fuzzer_${NAME} ${SOURCE_FILES})
+    add_executable(fuzzer_${NAME} EXCLUDE_FROM_ALL ${SOURCE_FILES})
     target_link_libraries(fuzzer_${NAME} PRIVATE boost_url_fuzz)
     target_compile_options(fuzzer_${NAME} PRIVATE -g -O2 -fsanitize=fuzzer,address,undefined -fno-sanitize-recover=undefined)
     target_link_libraries(fuzzer_${NAME} PRIVATE -fsanitize=fuzzer,address,undefined)
diff --git a/test/limits/CMakeLists.txt b/test/limits/CMakeLists.txt
index 0f474cf1e..78c916c4b 100644
--- a/test/limits/CMakeLists.txt
+++ b/test/limits/CMakeLists.txt
@@ -13,7 +13,7 @@ boost_url_setup_properties(boost_url_small_limits)
 target_compile_definitions(boost_url_small_limits PUBLIC BOOST_URL_MAX_SIZE=16 BOOST_URL_NO_LIB=1)
 
 # Test target
-add_executable(boost_url_limits limits.cpp Jamfile ${SUITE_FILES})
+add_executable(boost_url_limits EXCLUDE_FROM_ALL limits.cpp Jamfile ${SUITE_FILES})
 target_include_directories(boost_url_limits PRIVATE ../../include ../../extra ../../..)
 target_link_libraries(boost_url_limits PRIVATE boost_url_small_limits)
 if (DEFINED BOOST_URL_TEST_FLAGS AND NOT BOOST_URL_TEST_FLAGS STREQUAL "")
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 95e7efb88..3dfae37b0 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND BOOST_URL_TESTS_FILES CMakeLists.txt Jamfile)
 set(EXAMPLE_FILES ../../example/router/impl/matches.cpp ../../example/router/detail/impl/router.cpp)
 
 # Test target
-add_executable(boost_url_unit_tests ${BOOST_URL_TESTS_FILES} ${SUITE_FILES} ${EXAMPLE_FILES})
+add_executable(boost_url_unit_tests EXCLUDE_FROM_ALL ${BOOST_URL_TESTS_FILES} ${SUITE_FILES} ${EXAMPLE_FILES})
 target_include_directories(boost_url_unit_tests PRIVATE . ../../extra ../../example/router)
 target_link_libraries(boost_url_unit_tests PUBLIC Boost::url)
 foreach (BOOST_URL_UNIT_TEST_LIBRARY ${BOOST_URL_UNIT_TEST_LIBRARIES})