diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b8e926f96..1ac844f1f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,25 +1 @@
-find_package(GTest 1.10 REQUIRED NO_MODULE)
-
-add_executable(projectM-unittest
-        PCMTest.cpp
-        )
-
-target_compile_definitions(projectM-unittest
-        PRIVATE
-        PROJECTM_TEST_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data"
-        )
-
-# Test includes a header file from libprojectM with its full path in the source dir.
-target_include_directories(projectM-unittest
-        PRIVATE
-        "${CMAKE_SOURCE_DIR}"
-        )
-
-target_link_libraries(projectM-unittest
-        PRIVATE
-        projectM_static
-        GTest::gtest
-        GTest::gtest_main
-        )
-
-add_test(NAME projectM-unittest COMMAND projectM-unittest)
+add_subdirectory(libprojectM)
diff --git a/tests/libprojectM/CMakeLists.txt b/tests/libprojectM/CMakeLists.txt
new file mode 100644
index 000000000..b8e926f96
--- /dev/null
+++ b/tests/libprojectM/CMakeLists.txt
@@ -0,0 +1,25 @@
+find_package(GTest 1.10 REQUIRED NO_MODULE)
+
+add_executable(projectM-unittest
+        PCMTest.cpp
+        )
+
+target_compile_definitions(projectM-unittest
+        PRIVATE
+        PROJECTM_TEST_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data"
+        )
+
+# Test includes a header file from libprojectM with its full path in the source dir.
+target_include_directories(projectM-unittest
+        PRIVATE
+        "${CMAKE_SOURCE_DIR}"
+        )
+
+target_link_libraries(projectM-unittest
+        PRIVATE
+        projectM_static
+        GTest::gtest
+        GTest::gtest_main
+        )
+
+add_test(NAME projectM-unittest COMMAND projectM-unittest)
diff --git a/tests/PCMTest.cpp b/tests/libprojectM/PCMTest.cpp
similarity index 100%
rename from tests/PCMTest.cpp
rename to tests/libprojectM/PCMTest.cpp