diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8f9f4519..3f2fb3ca 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -48,6 +48,7 @@ add_library (
         ${ZLIB_SOURCES}
 )
 target_include_directories(lib-zlib PUBLIC "${CMAKE_CURRENT_LIST_DIR}/extern/zlib-1.2.11")
+set_property(TARGET lib-zlib PROPERTY FOLDER "static-libs")
 
 set (TEST_MAIN ${PROJECT_SOURCE_DIR}/test/lib_beast.cpp)
 
diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt
index cb3c1eb5..72323449 100644
--- a/test/beast/CMakeLists.txt
+++ b/test/beast/CMakeLists.txt
@@ -69,11 +69,11 @@ target_link_libraries(tests-beast
 
 set_property(TARGET tests-beast PROPERTY FOLDER "tests")
 
-add_custom_target(tests-beast-all
-        DEPENDS
-            tests-beast-_experimental-all
-            tests-beast-core-all
-            tests-beast-http-all
-            tests-beast-ssl-all
-            tests-beast-websocket-all
-            tests-beast-zlib-all )
\ No newline at end of file
+#add_custom_target(tests-beast-all
+#        DEPENDS
+#            tests-beast-_experimental-all
+#            tests-beast-core-all
+#            tests-beast-http-all
+#            tests-beast-ssl-all
+#            tests-beast-websocket-all
+#            tests-beast-zlib-all )
diff --git a/test/beast/_experimental/CMakeLists.txt b/test/beast/_experimental/CMakeLists.txt
index 9b50683f..34e4dbad 100644
--- a/test/beast/_experimental/CMakeLists.txt
+++ b/test/beast/_experimental/CMakeLists.txt
@@ -30,6 +30,6 @@ set_property(TARGET tests-beast-_experimental PROPERTY FOLDER "tests")
 #
 # Individual tests
 #
-build_individual_tests(tests-beast-_experimental
-        EXCLUDE
-        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
+#build_individual_tests(tests-beast-_experimental
+#        EXCLUDE
+#        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt
index ed803ac7..3f332814 100644
--- a/test/beast/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@@ -76,6 +76,6 @@ set_property(TARGET tests-beast-core PROPERTY FOLDER "tests")
 #
 # Individual tests
 #
-build_individual_tests(tests-beast-core
-        EXCLUDE _detail_static_const close_socket zlib make_strand prepare_buffers
-        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
+#build_individual_tests(tests-beast-core
+#        EXCLUDE _detail_static_const close_socket zlib make_strand prepare_buffers
+#        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
diff --git a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
index 9cf12f85..cfbbb422 100644
--- a/test/beast/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@@ -55,4 +55,4 @@ set_property(TARGET tests-beast-http PROPERTY FOLDER "tests")
 #
 # Individual tests
 #
-build_individual_tests(tests-beast-http LIBS lib-asio lib-asio-ssl lib-beast lib-test)
+#build_individual_tests(tests-beast-http LIBS lib-asio lib-asio-ssl lib-beast lib-test)
diff --git a/test/beast/ssl/CMakeLists.txt b/test/beast/ssl/CMakeLists.txt
index fd28edfe..04f7fa11 100644
--- a/test/beast/ssl/CMakeLists.txt
+++ b/test/beast/ssl/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(tests-beast-ssl
 
 set_property(TARGET tests-beast-ssl PROPERTY FOLDER "tests")
 
-build_individual_tests(tests-beast-ssl LIBS lib-asio lib-asio-ssl lib-beast lib-test)
+#build_individual_tests(tests-beast-ssl LIBS lib-asio lib-asio-ssl lib-beast lib-test)
diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
index 48e1bf3a..ee7a5665 100644
--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -51,6 +51,6 @@ target_link_libraries(tests-beast-websocket
 
 set_property(TARGET tests-beast-websocket PROPERTY FOLDER "tests")
 
-build_individual_tests(tests-beast-websocket
-        EXCLUDE doc_snippets
-        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
+#build_individual_tests(tests-beast-websocket
+#        EXCLUDE doc_snippets
+#        LIBS lib-asio lib-asio-ssl lib-beast lib-test)
diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt
index 20bd037d..232dea42 100644
--- a/test/beast/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@@ -33,4 +33,4 @@ target_link_libraries(tests-beast-zlib
 
 set_property(TARGET tests-beast-zlib PROPERTY FOLDER "tests")
 
-build_individual_tests(tests-beast-zlib LIBS lib-asio lib-beast lib-test lib-zlib)
+#build_individual_tests(tests-beast-zlib LIBS lib-asio lib-beast lib-test lib-zlib)