diff --git a/test/simulator/meson.build b/test/simulator/meson.build
index 1bcdc6a..82e2336 100644
--- a/test/simulator/meson.build
+++ b/test/simulator/meson.build
@@ -1,15 +1,11 @@
 # Simulator sources
-sim_src = [
+sim_src = files(
     'simulator.cpp',
     'sim_hardware_access.cpp',
     '../sim_tracing.cpp'
-]
+)
 
-# Test cases
-test_src = [
-    'sample_test_case.cpp',
-    'test_cases/exp20_foxhound7.cpp',
-]
+subdir('testcases')
 
 gtest = dependency('gtest', main : true, required : false, method : 'system')
 
diff --git a/test/simulator/test_cases/exp20_foxhound7.cpp b/test/simulator/testcases/exp20_foxhound7.cpp
similarity index 100%
rename from test/simulator/test_cases/exp20_foxhound7.cpp
rename to test/simulator/testcases/exp20_foxhound7.cpp
diff --git a/test/simulator/testcases/meson.build b/test/simulator/testcases/meson.build
new file mode 100644
index 0000000..076a617
--- /dev/null
+++ b/test/simulator/testcases/meson.build
@@ -0,0 +1,6 @@
+# Test cases
+test_src = files(
+    'sample_test_case.cpp',
+    'exp20_foxhound7.cpp',
+)
+
diff --git a/test/simulator/sample_test_case.cpp b/test/simulator/testcases/sample_test_case.cpp
similarity index 100%
rename from test/simulator/sample_test_case.cpp
rename to test/simulator/testcases/sample_test_case.cpp