diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
similarity index 100%
rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini
rename to tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
similarity index 100%
rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr
rename to tests/quick/se/50.memtest/ref/null/none/memtest/simerr
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simout b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
similarity index 100%
rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/simout
rename to tests/quick/se/50.memtest/ref/null/none/memtest/simout
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
similarity index 100%
rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/stats.txt
rename to tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simerr b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simerr
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simout
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simerr b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simerr
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simerr
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simerr
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simout
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt
similarity index 100%
rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt
rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt
diff --git a/tests/run.py b/tests/run.py
index bc76717c0..461813559 100644
--- a/tests/run.py
+++ b/tests/run.py
@@ -192,8 +192,10 @@ def initCPUs(sys):
     def initCPU(cpu):
         # We might actually have a MemTest object or something similar
         # here that just pretends to be a CPU.
-        if isinstance(cpu, BaseCPU):
+        try:
             cpu.createThreads()
+        except:
+            pass
 
     # The CPU attribute doesn't exist in some cases, e.g. the Ruby
     # testers.