diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
similarity index 100%
rename from tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
rename to tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
similarity index 100%
rename from tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
rename to tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
similarity index 100%
rename from tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
rename to tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
similarity index 100%
rename from tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
rename to tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
similarity index 100%
rename from tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
rename to tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/chair.cook.ppm b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/chair.cook.ppm
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/chair.cook.ppm
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/chair.cook.ppm
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/config.ini b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/config.ini
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/config.ini
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/config.ini
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/mcf.out b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/mcf.out
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/mcf.out
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/mcf.out
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/simerr b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/simerr
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/simerr
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/simerr
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/simout b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/simout
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/simout
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/simout
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt b/tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/chair.cook.ppm b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/chair.cook.ppm
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/chair.cook.ppm
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/chair.cook.ppm
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/config.ini b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/config.ini
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/config.ini
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/config.ini
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/mcf.out b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/mcf.out
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/mcf.out
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/mcf.out
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/simerr b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/simerr
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/simerr
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/simerr
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/simout b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/simout
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/simout
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/simout
diff --git a/tests/long/se/10.mcf/ref/arm/linux/simple-timing/stats.txt b/tests/quick/se/10.mcf/ref/arm/linux/simple-timing/stats.txt
similarity index 100%
rename from tests/long/se/10.mcf/ref/arm/linux/simple-timing/stats.txt
rename to tests/quick/se/10.mcf/ref/arm/linux/simple-timing/stats.txt
diff --git a/tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/config.ini
similarity index 100%
rename from tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/config.ini
rename to tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/config.ini
diff --git a/tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/mcf.out b/tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/mcf.out
similarity index 100%
rename from tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/mcf.out
rename to tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/mcf.out
diff --git a/tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/simerr b/tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/simerr
similarity index 100%
rename from tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/simerr
rename to tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/simerr
diff --git a/tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/simout b/tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/simout
similarity index 100%
rename from tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/simout
rename to tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/simout
diff --git a/tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/stats.txt b/tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
similarity index 100%
rename from tests/long/se/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
rename to tests/quick/se/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
similarity index 100%
rename from tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
rename to tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/mcf.out b/tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/mcf.out
similarity index 100%
rename from tests/long/se/10.mcf/ref/x86/linux/simple-atomic/mcf.out
rename to tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/mcf.out
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simerr b/tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/simerr
similarity index 100%
rename from tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simerr
rename to tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/simerr
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout b/tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/simout
similarity index 100%
rename from tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
rename to tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/simout
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt b/tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
similarity index 100%
rename from tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
rename to tests/quick/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
diff --git a/tests/quick/se/10.mcf/test.py b/tests/quick/se/10.mcf/test.py
new file mode 100644
index 0000000000..0ea3f370d2
--- /dev/null
+++ b/tests/quick/se/10.mcf/test.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Korey Sewell
+
+m5.util.addToPath('../configs/common')
+from cpu2000 import mcf
+
+workload = mcf(isa, opsys, 'smred')
+root.system.cpu[0].workload = workload.makeLiveProcess()
+root.system.physmem.range=AddrRange('256MB')
diff --git a/tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/config.ini b/tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/config.ini
similarity index 100%
rename from tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/config.ini
rename to tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/config.ini
diff --git a/tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/simerr b/tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/simerr
similarity index 100%
rename from tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/simerr
rename to tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/simerr
diff --git a/tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/simout b/tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/simout
similarity index 100%
rename from tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/simout
rename to tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/simout
diff --git a/tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/stats.txt b/tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/stats.txt
similarity index 100%
rename from tests/long/se/30.eon/ref/alpha/tru64/simple-atomic/stats.txt
rename to tests/quick/se/30.eon/ref/alpha/tru64/simple-atomic/stats.txt
diff --git a/tests/quick/se/30.eon/test.py b/tests/quick/se/30.eon/test.py
new file mode 100644
index 0000000000..2ad1ef4297
--- /dev/null
+++ b/tests/quick/se/30.eon/test.py
@@ -0,0 +1,33 @@
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Korey Sewell
+
+m5.util.addToPath('../configs/common')
+from cpu2000 import eon_cook
+
+workload = eon_cook(isa, opsys, 'mdred')
+root.system.cpu[0].workload = workload.makeLiveProcess()