diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 13493b56..3674c2ff 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,12 +14,12 @@ add_executable(
   yaze_test
   yaze_test.cc
   z3ed_test.cc
-  cpu_test.cc
-  spc700_test.cc
-  ../src/cli/patch.cc
-  ../src/cli/command_handler.cc
+  emu/cpu_test.cc
+  emu/spc700_test.cc
   compression_test.cc
   snes_palette_test.cc
+  ../src/cli/patch.cc
+  ../src/cli/command_handler.cc
   ../src/app/rom.cc
   ../src/app/emu/cpu.cc
   ../src/app/emu/audio/apu.cc
diff --git a/test/cpu_test.cc b/test/emu/cpu_test.cc
similarity index 100%
rename from test/cpu_test.cc
rename to test/emu/cpu_test.cc
diff --git a/test/ppu_test.cc b/test/emu/ppu_test.cc
similarity index 100%
rename from test/ppu_test.cc
rename to test/emu/ppu_test.cc
diff --git a/test/spc700_test.cc b/test/emu/spc700_test.cc
similarity index 100%
rename from test/spc700_test.cc
rename to test/emu/spc700_test.cc