diff --git a/README.md b/README.md
index 3eba05b..8ccb0b7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ make GTKD=/path/to/gtkd DERELICT=/path/to/Derelict2
 There are tests for the 6502/65C02 emulation:
 
 ```
-cd test
+cd test/d6502
 rdmd runtests.d --help
 ```
 
diff --git a/test/benchopts b/test/benchopts
deleted file mode 100644
index 30212ee..0000000
--- a/test/benchopts
+++ /dev/null
@@ -1,2 +0,0 @@
--version=Benchmark -inline -release -O -noboundscheck -I.. -I../src
-
diff --git a/test/base.d b/test/d6502/base.d
similarity index 99%
rename from test/base.d
rename to test/d6502/base.d
index 6072765..19776a8 100644
--- a/test/base.d
+++ b/test/d6502/base.d
@@ -1,10 +1,10 @@
-module test.base;
+module test.d6502.base;
 
 
 import std.algorithm, std.array, std.conv, std.exception, std.getopt,
        std.stdio, std.string;
 
-import test.cpu, test.opcodes;
+import test.d6502.cpu, test.d6502.opcodes;
 import cpu.data_d6502;
 
 
diff --git a/test/d6502/benchopts b/test/d6502/benchopts
new file mode 100644
index 0000000..6af1ac0
--- /dev/null
+++ b/test/d6502/benchopts
@@ -0,0 +1,2 @@
+-version=Benchmark -inline -release -O -noboundscheck -I../.. -I../../src
+
diff --git a/test/cpu.d b/test/d6502/cpu.d
similarity index 99%
rename from test/cpu.d
rename to test/d6502/cpu.d
index 063f8cb..2aec369 100644
--- a/test/cpu.d
+++ b/test/d6502/cpu.d
@@ -3,14 +3,14 @@
  * implementation, or that may be useful to any test which requires a
  * cpu (as opposed to testing the cpu itself).
  */
-module test.cpu;
+module test.d6502.cpu;
 
 
 import std.conv, std.exception, std.random, std.string, std.traits;
 
 public import cpu.d6502 : Cpu, is6502, is65C02;
 
-import test.base : strict, cumulative;
+import test.d6502.base : strict, cumulative;
 
 
 // True if T is the type of a cpu.
diff --git a/test/opcodes.d b/test/d6502/opcodes.d
similarity index 99%
rename from test/opcodes.d
rename to test/d6502/opcodes.d
index f07fcda..2beea06 100644
--- a/test/opcodes.d
+++ b/test/d6502/opcodes.d
@@ -1,7 +1,7 @@
-module test.opcodes;
+module test.d6502.opcodes;
 
 
-import test.cpu;
+import test.d6502.cpu;
 
 
 // 2-cycle opcodes which neither read nor write.
diff --git a/test/runtests.d b/test/d6502/runtests.d
similarity index 96%
rename from test/runtests.d
rename to test/d6502/runtests.d
index 32903a2..90ad4e7 100644
--- a/test/runtests.d
+++ b/test/d6502/runtests.d
@@ -134,7 +134,8 @@ void runTest(OpDefs def, Tests test, string[] args)
             writeln("With strict=", s, " cumulative=", c);
             string cmdline = defStrings[def] ~ stStrings[s] ~ cmStrings[c] ~
                              fNames[test] ~ join(args, " ");
-            system("rdmd --force -I.. -I../src -version=RunTest " ~ cmdline);
+            system("rdmd --force -I../.. -I../../src -version=RunTest " ~
+                   cmdline);
         }
     }
 }
diff --git a/test/test_bus.d b/test/d6502/test_bus.d
similarity index 91%
rename from test/test_bus.d
rename to test/d6502/test_bus.d
index c6f673b..61497dc 100644
--- a/test/test_bus.d
+++ b/test/d6502/test_bus.d
@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void main(string[] args)
diff --git a/test/test_decimal.d b/test/d6502/test_decimal.d
similarity index 99%
rename from test/test_decimal.d
rename to test/d6502/test_decimal.d
index 3df6c33..e019ef7 100644
--- a/test/test_decimal.d
+++ b/test/d6502/test_decimal.d
@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void testDecimalMode(T)()
diff --git a/test/test_func.d b/test/d6502/test_func.d
similarity index 91%
rename from test/test_func.d
rename to test/d6502/test_func.d
index d16a715..63d3c82 100644
--- a/test/test_func.d
+++ b/test/d6502/test_func.d
@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void main(string[] args)