diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b61998..74346d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,16 +293,6 @@ add_executable(alltests
 	test/msleep.cc
 	test/mock_authenticator.cc
 	test/mock_request.cc
-	test/test_response_parser.cc
-	test/test_server.cc
-	test/test_timepoint.cc
-	test/test_timer.cc
-	test/test_url.cc
-	test/test_credentials.cc
-	test/test_authenticator.cc
-	test/test_authenticators.cc
-	test/test_static_filesystem.cc
-	test/test_fuse_req.cc
 	test/core/test_container_of.cc
 	test/core/test_string.cc
 	test/core/test_slist.cc
@@ -310,10 +300,20 @@ add_executable(alltests
 	test/core/test_status.cc
 	test/core/test_message.cc
 	test/core/test_message_queue.cc
+	test/adapter/test_response_parser.cc
+	test/adapter/test_server.cc
+	test/adapter/test_timepoint.cc
+	test/adapter/test_timer.cc
+	test/adapter/test_credentials.cc
+	test/adapter/test_authenticator.cc
+	test/adapter/test_authenticators.cc
+	test/adapter/test_fuse_req.cc
+	test/test_url.cc
+	test/test_static_filesystem.cc
 )
 
 target_link_libraries(alltests PUBLIC webfuse-adapter-static webfuse-provider-static webfuse-core ${EXTRA_LIBS} ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
-target_include_directories(alltests PUBLIC lib ${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
+target_include_directories(alltests PUBLIC test lib ${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
 target_compile_options(alltests PUBLIC ${GMOCK_CFLAGS} ${GTEST_CFLAGS})
 
 enable_testing()
diff --git a/test/test_authenticator.cc b/test/adapter/test_authenticator.cc
similarity index 100%
rename from test/test_authenticator.cc
rename to test/adapter/test_authenticator.cc
diff --git a/test/test_authenticators.cc b/test/adapter/test_authenticators.cc
similarity index 100%
rename from test/test_authenticators.cc
rename to test/adapter/test_authenticators.cc
diff --git a/test/test_credentials.cc b/test/adapter/test_credentials.cc
similarity index 100%
rename from test/test_credentials.cc
rename to test/adapter/test_credentials.cc
diff --git a/test/test_fuse_req.cc b/test/adapter/test_fuse_req.cc
similarity index 100%
rename from test/test_fuse_req.cc
rename to test/adapter/test_fuse_req.cc
diff --git a/test/test_response_parser.cc b/test/adapter/test_response_parser.cc
similarity index 100%
rename from test/test_response_parser.cc
rename to test/adapter/test_response_parser.cc
diff --git a/test/test_server.cc b/test/adapter/test_server.cc
similarity index 100%
rename from test/test_server.cc
rename to test/adapter/test_server.cc
diff --git a/test/test_timepoint.cc b/test/adapter/test_timepoint.cc
similarity index 100%
rename from test/test_timepoint.cc
rename to test/adapter/test_timepoint.cc
diff --git a/test/test_timer.cc b/test/adapter/test_timer.cc
similarity index 100%
rename from test/test_timer.cc
rename to test/adapter/test_timer.cc