diff --git a/Makeconf b/Makeconf
index 5f4ffd5..501c5d6 100644
--- a/Makeconf
+++ b/Makeconf
@@ -16,9 +16,13 @@ modules_libemu.a := memory/device.o \
 modules_vgbc := main.o libemu.a
 verb_vgbc := link
 
-modules_vgbc.test := $(patsubst %.cpp,%.o,$(wildcard tests/*.cpp)) libemu.a
+sources_vgbc.test := $(shell find tests/ -name '*.cpp')
+objects_vgbc.test := $(patsubst %.cpp,%.o,$(sources_vgbc.test))
+modules_vgbc.test := $(objects_vgbc.test) libemu.a
 verb_vgbc.test := link
 
+$(objects_vgbc.test): CXX_FLAGS+=-I $(CURDIR)/tests
+
 modules_vgbc.inspect := cartridge/inspector.o libemu.a
 verb_vgbc.inspect := link
 
diff --git a/tests/test_cpu_exception.cpp b/tests/cpu/test_cpu_exception.cpp
similarity index 100%
rename from tests/test_cpu_exception.cpp
rename to tests/cpu/test_cpu_exception.cpp
diff --git a/tests/test_cpu_interrupts.cpp b/tests/cpu/test_cpu_interrupts.cpp
similarity index 100%
rename from tests/test_cpu_interrupts.cpp
rename to tests/cpu/test_cpu_interrupts.cpp
diff --git a/tests/test_cpu_prefix.cpp b/tests/cpu/test_cpu_prefix.cpp
similarity index 100%
rename from tests/test_cpu_prefix.cpp
rename to tests/cpu/test_cpu_prefix.cpp
diff --git a/tests/test_cpu_simple.cpp b/tests/cpu/test_cpu_simple.cpp
similarity index 100%
rename from tests/test_cpu_simple.cpp
rename to tests/cpu/test_cpu_simple.cpp
diff --git a/tests/test_cpu_state.cpp b/tests/cpu/test_cpu_state.cpp
similarity index 100%
rename from tests/test_cpu_state.cpp
rename to tests/cpu/test_cpu_state.cpp
diff --git a/tests/test_bus.cpp b/tests/memory/test_bus.cpp
similarity index 100%
rename from tests/test_bus.cpp
rename to tests/memory/test_bus.cpp
diff --git a/tests/test_memory_register.cpp b/tests/memory/test_memory_register.cpp
similarity index 100%
rename from tests/test_memory_register.cpp
rename to tests/memory/test_memory_register.cpp
diff --git a/tests/test_ram.cpp b/tests/memory/test_ram.cpp
similarity index 100%
rename from tests/test_ram.cpp
rename to tests/memory/test_ram.cpp