diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 520bbd3..f52fc52 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,9 @@ find_package(GTest REQUIRED)
 
 include(GoogleTest)
 
-add_executable(pacman_tests tests.cpp)
+file(GLOB_RECURSE sources CONFIGURE_DEPENDS "*.cpp")
+
+add_executable(pacman_tests ${sources})
 target_link_libraries(pacman_tests GTest::GTest libpacman)
 
 gtest_discover_tests(pacman_tests TEST_PREFIX pacman:)
diff --git a/test/testPacMan.cpp b/test/testPacMan.cpp
new file mode 100644
index 0000000..573df68
--- /dev/null
+++ b/test/testPacMan.cpp
@@ -0,0 +1,8 @@
+#include "PacMan.hpp"
+#include <gtest/gtest.h>
+
+TEST(PacManTest, InitialPosition) {
+  pacman::PacMan pacMan;
+  EXPECT_EQ(pacMan.position().x, 13.5);
+  EXPECT_EQ(pacMan.position().y, 23);
+}
diff --git a/test/testPosition.cpp b/test/testPosition.cpp
new file mode 100644
index 0000000..17b36dd
--- /dev/null
+++ b/test/testPosition.cpp
@@ -0,0 +1,6 @@
+#include "Position.hpp"
+#include <gtest/gtest.h>
+
+TEST(PacManTest, Position) {
+  EXPECT_EQ(1, 1);
+}
diff --git a/test/tests.cpp b/test/tests.cpp
index 2322486..e61612e 100644
--- a/test/tests.cpp
+++ b/test/tests.cpp
@@ -1,12 +1,5 @@
-#include "PacMan.hpp"
 #include <gtest/gtest.h>
 
-TEST(PacManTest, InitialPosition) {
-  pacman::PacMan pacMan;
-  EXPECT_EQ(pacMan.position().x, 13.5);
-  EXPECT_EQ(pacMan.position().y, 23);
-}
-
 int main(int argc, char * argv[]) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();