diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5770d67..33250ca 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -21,3 +21,20 @@ set_target_properties(core PROPERTIES
     CXX_STANDARD_REQUIRED ON
     POSITION_INDEPENDENT_CODE True
     )
+
+add_executable(runtests 
+    test/main.cpp
+    test/tst_CsvWriter.cpp
+    test/tst_expected.cpp
+    test/tst_PasswordManager.cpp
+    test/tst_scopeguard.cpp
+    test/tst_SqlLexer.cpp
+    )
+    
+target_link_libraries(runtests 
+    core 
+    gtest
+    Threads::Threads
+    )
+
+add_test(tests runtests)
diff --git a/src/tests/main.cpp b/src/core/tests/main.cpp
similarity index 100%
rename from src/tests/main.cpp
rename to src/core/tests/main.cpp
diff --git a/src/tests/tst_CsvWriter.cpp b/src/core/tests/tst_CsvWriter.cpp
similarity index 100%
rename from src/tests/tst_CsvWriter.cpp
rename to src/core/tests/tst_CsvWriter.cpp
diff --git a/src/tests/tst_PasswordManager.cpp b/src/core/tests/tst_PasswordManager.cpp
similarity index 100%
rename from src/tests/tst_PasswordManager.cpp
rename to src/core/tests/tst_PasswordManager.cpp
diff --git a/src/tests/tst_SqlLexer.cpp b/src/core/tests/tst_SqlLexer.cpp
similarity index 100%
rename from src/tests/tst_SqlLexer.cpp
rename to src/core/tests/tst_SqlLexer.cpp
diff --git a/src/tests/tst_expected.cpp b/src/core/tests/tst_expected.cpp
similarity index 100%
rename from src/tests/tst_expected.cpp
rename to src/core/tests/tst_expected.cpp
diff --git a/src/tests/tst_scopeguard.cpp b/src/core/tests/tst_scopeguard.cpp
similarity index 100%
rename from src/tests/tst_scopeguard.cpp
rename to src/core/tests/tst_scopeguard.cpp
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
deleted file mode 100644
index e900f74..0000000
--- a/src/tests/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-add_executable(runtests 
-    main.cpp
-    tst_CsvWriter.cpp
-    tst_expected.cpp
-    tst_PasswordManager.cpp
-    tst_scopeguard.cpp
-    tst_SqlLexer.cpp
-    )
-    
-target_link_libraries(runtests 
-    core 
-    gtest
-    Threads::Threads
-    )
-
-add_test(tests runtests)