diff --git a/CMakeLists.txt b/CMakeLists.txt
index c41adcdb..516595ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,10 @@ project(lms)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
+include(CTest)
 find_package(PkgConfig)
 pkg_check_modules(IMAGEMAGICKXX REQUIRED ImageMagick++)
 
-enable_testing()
-
 add_subdirectory(src)
 
 install(DIRECTORY approot DESTINATION share/lms)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d88e62ec..c796f0e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,4 +4,8 @@ add_subdirectory(libs)
 add_subdirectory(lms)
 add_subdirectory(tools)
 
+if(BUILD_TESTING)
+	add_subdirectory(test)
+endif()
+
 
diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt
index aae05b4f..638fb2e2 100644
--- a/src/libs/database/CMakeLists.txt
+++ b/src/libs/database/CMakeLists.txt
@@ -35,4 +35,3 @@ target_link_libraries(lmsdatabase PUBLIC
 
 install(TARGETS lmsdatabase DESTINATION lib)
 
-add_subdirectory(test)
diff --git a/src/libs/som/CMakeLists.txt b/src/libs/som/CMakeLists.txt
index 2d7ca9ef..7cb1b45e 100644
--- a/src/libs/som/CMakeLists.txt
+++ b/src/libs/som/CMakeLists.txt
@@ -16,4 +16,3 @@ target_link_libraries(lmssom PUBLIC
 	lmsutils
 	)
 
-add_subdirectory(test)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 00000000..d2d34662
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_subdirectory(database)
+add_subdirectory(som)
+
diff --git a/src/libs/database/test/CMakeLists.txt b/src/test/database/CMakeLists.txt
similarity index 100%
rename from src/libs/database/test/CMakeLists.txt
rename to src/test/database/CMakeLists.txt
diff --git a/src/libs/database/test/DatabaseTest.cpp b/src/test/database/DatabaseTest.cpp
similarity index 100%
rename from src/libs/database/test/DatabaseTest.cpp
rename to src/test/database/DatabaseTest.cpp
diff --git a/src/libs/som/test/CMakeLists.txt b/src/test/som/CMakeLists.txt
similarity index 100%
rename from src/libs/som/test/CMakeLists.txt
rename to src/test/som/CMakeLists.txt
diff --git a/src/libs/som/test/SomTest.cpp b/src/test/som/SomTest.cpp
similarity index 100%
rename from src/libs/som/test/SomTest.cpp
rename to src/test/som/SomTest.cpp