diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/pc-simple-atomic.py
--- a/tests/configs/pc-simple-atomic.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/pc-simple-atomic.py	Wed Oct 16 14:53:01 2013 +0100
@@ -39,5 +39,5 @@
 from x86_generic import *
 
 root = LinuxX86FSSystemUniprocessor(mem_mode='atomic',
-                                    mem_class=DDR3_1600_x64,
+                                    mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/realview-simple-atomic-dual.py
--- a/tests/configs/realview-simple-atomic-dual.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/realview-simple-atomic-dual.py	Wed Oct 16 14:53:01 2013 +0100
@@ -39,6 +39,6 @@
 from arm_generic import *
 
 root = LinuxArmFSSystem(mem_mode='atomic',
-                        mem_class=DDR3_1600_x64,
+                        mem_class=SimpleMemory,
                         cpu_class=AtomicSimpleCPU,
                         num_cpus=2).create_root()
diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/realview-simple-atomic.py
--- a/tests/configs/realview-simple-atomic.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/realview-simple-atomic.py	Wed Oct 16 14:53:01 2013 +0100
@@ -39,6 +39,6 @@
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(mem_mode='atomic',
-                                    mem_class=DDR3_1600_x64,
+                                    mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
 
diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/realview-switcheroo-atomic.py
--- a/tests/configs/realview-switcheroo-atomic.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/realview-switcheroo-atomic.py	Wed Oct 16 14:53:01 2013 +0100
@@ -40,7 +40,7 @@
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    mem_class=DDR3_1600_x64,
+    mem_class=SimpleMemory,
     cpu_classes=(AtomicSimpleCPU, AtomicSimpleCPU)
     ).create_root()
 
diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/tsunami-simple-atomic-dual.py
--- a/tests/configs/tsunami-simple-atomic-dual.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/tsunami-simple-atomic-dual.py	Wed Oct 16 14:53:01 2013 +0100
@@ -39,6 +39,6 @@
 from alpha_generic import *
 
 root = LinuxAlphaFSSystem(mem_mode='atomic',
-                          mem_class=DDR3_1600_x64,
+                          mem_class=SimpleMemory,
                           cpu_class=AtomicSimpleCPU,
                           num_cpus=2).create_root()
diff -r 37c01f4f7165 -r b6e2303f911d tests/configs/tsunami-simple-atomic.py
--- a/tests/configs/tsunami-simple-atomic.py	Wed Oct 16 14:52:59 2013 +0100
+++ b/tests/configs/tsunami-simple-atomic.py	Wed Oct 16 14:53:01 2013 +0100
@@ -39,5 +39,5 @@
 from alpha_generic import *
 
 root = LinuxAlphaFSSystemUniprocessor(mem_mode='atomic',
-                                      mem_class=DDR3_1600_x64,
+                                      mem_class=SimpleMemory,
                                       cpu_class=AtomicSimpleCPU).create_root()