3 files changed, 6 insertions, 6 deletions
diff --git a/configs/test/SysPaths.py b/configs/test/SysPaths.py
index 7f231916c..c7c7db4e7 100644
--- a/configs/test/SysPaths.py
+++ b/configs/test/SysPaths.py
@@ -22,11 +22,11 @@ BINDIR = SYSTEMDIR + '/binaries'
 DISKDIR = SYSTEMDIR + '/disks'
 
 def disk(file):
-    return '%s/%s' % (DISKDIR, file)
+    return os.path.join(DISKDIR, file)
 
 def binary(file):
-    return '%s/%s' % (BINDIR, file)
+    return os.path.join(BINDIR, file)
 
 def script(file):
-    return '%s/%s' % ('/z/saidi/work/m5.newmem/configs/boot', file)
+    return os.path.join(SYSTEMDIR, 'boot', file)
 
diff --git a/configs/test/fs.py b/configs/test/fs.py
index ce121bd76..fdbf86abe 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -181,9 +181,9 @@ class LinuxAlphaSystem(LinuxAlphaSystem):
                              read_only=True)
     simple_disk = SimpleDisk(disk=Parent.raw_image)
     intrctrl = IntrControl()
-    cpu = SimpleCPU(mem=Parent.magicbus2)
+    cpu = AtomicSimpleCPU(mem=Parent.magicbus2)
     sim_console = SimConsole(listener=ConsoleListener(port=3456))
-    kernel = '/z/saidi/work/m5.newmem/build/vmlinux'
+    kernel = binary('vmlinux')
     pal = binary('ts_osfpal')
     console = binary('console')
     boot_osflags = 'root=/dev/hda1 console=ttyS0'
diff --git a/configs/test/test.py b/configs/test/test.py
index 695d84b73..75e832f5e 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -6,7 +6,7 @@ class HelloWorld(AlphaLiveProcess):
 
 magicbus = Bus()
 mem = PhysicalMemory()
-cpu = SimpleCPU(workload=HelloWorld(), mem=magicbus)
+cpu = AtomicSimpleCPU(workload=HelloWorld(), mem=magicbus)
 system = System(physmem=mem, cpu=cpu)
 system.c1 =  Connector(side_a=mem, side_b=magicbus)
 root = Root(system=system)