diff --git a/tests/configs/arm_generic.py b/tests/gem5/configs/arm_generic.py
similarity index 100%
rename from tests/configs/arm_generic.py
rename to tests/gem5/configs/arm_generic.py
diff --git a/tests/configs/base_config.py b/tests/gem5/configs/base_config.py
similarity index 99%
rename from tests/configs/base_config.py
rename to tests/gem5/configs/base_config.py
index b124a13..b5bddf4 100644
--- a/tests/configs/base_config.py
+++ b/tests/gem5/configs/base_config.py
@@ -38,7 +38,6 @@
 import m5
 from m5.objects import *
 from m5.proxy import *
-m5.util.addToPath('../configs/')
 from common import FSConfig
 from common import Options
 from common.Caches import *
diff --git a/tests/configs/checkpoint.py b/tests/gem5/configs/checkpoint.py
similarity index 100%
rename from tests/configs/checkpoint.py
rename to tests/gem5/configs/checkpoint.py
diff --git a/tests/configs/realview-minor-dual.py b/tests/gem5/configs/realview-minor-dual.py
similarity index 100%
rename from tests/configs/realview-minor-dual.py
rename to tests/gem5/configs/realview-minor-dual.py
diff --git a/tests/configs/realview-minor.py b/tests/gem5/configs/realview-minor.py
similarity index 100%
rename from tests/configs/realview-minor.py
rename to tests/gem5/configs/realview-minor.py
diff --git a/tests/configs/realview-o3-checker.py b/tests/gem5/configs/realview-o3-checker.py
similarity index 100%
rename from tests/configs/realview-o3-checker.py
rename to tests/gem5/configs/realview-o3-checker.py
diff --git a/tests/configs/realview-o3-dual.py b/tests/gem5/configs/realview-o3-dual.py
similarity index 100%
rename from tests/configs/realview-o3-dual.py
rename to tests/gem5/configs/realview-o3-dual.py
diff --git a/tests/configs/realview-o3.py b/tests/gem5/configs/realview-o3.py
similarity index 100%
rename from tests/configs/realview-o3.py
rename to tests/gem5/configs/realview-o3.py
diff --git a/tests/configs/realview-simple-atomic-checkpoint.py b/tests/gem5/configs/realview-simple-atomic-checkpoint.py
similarity index 100%
rename from tests/configs/realview-simple-atomic-checkpoint.py
rename to tests/gem5/configs/realview-simple-atomic-checkpoint.py
diff --git a/tests/configs/realview-simple-atomic-dual.py b/tests/gem5/configs/realview-simple-atomic-dual.py
similarity index 100%
rename from tests/configs/realview-simple-atomic-dual.py
rename to tests/gem5/configs/realview-simple-atomic-dual.py
diff --git a/tests/configs/realview-simple-atomic.py b/tests/gem5/configs/realview-simple-atomic.py
similarity index 100%
rename from tests/configs/realview-simple-atomic.py
rename to tests/gem5/configs/realview-simple-atomic.py
diff --git a/tests/configs/realview-simple-timing-dual-ruby.py b/tests/gem5/configs/realview-simple-timing-dual-ruby.py
similarity index 100%
rename from tests/configs/realview-simple-timing-dual-ruby.py
rename to tests/gem5/configs/realview-simple-timing-dual-ruby.py
diff --git a/tests/configs/realview-simple-timing-dual.py b/tests/gem5/configs/realview-simple-timing-dual.py
similarity index 100%
rename from tests/configs/realview-simple-timing-dual.py
rename to tests/gem5/configs/realview-simple-timing-dual.py
diff --git a/tests/configs/realview-simple-timing-ruby.py b/tests/gem5/configs/realview-simple-timing-ruby.py
similarity index 100%
rename from tests/configs/realview-simple-timing-ruby.py
rename to tests/gem5/configs/realview-simple-timing-ruby.py
diff --git a/tests/configs/realview-simple-timing.py b/tests/gem5/configs/realview-simple-timing.py
similarity index 100%
rename from tests/configs/realview-simple-timing.py
rename to tests/gem5/configs/realview-simple-timing.py
diff --git a/tests/configs/realview-switcheroo-atomic.py b/tests/gem5/configs/realview-switcheroo-atomic.py
similarity index 100%
rename from tests/configs/realview-switcheroo-atomic.py
rename to tests/gem5/configs/realview-switcheroo-atomic.py
diff --git a/tests/configs/realview-switcheroo-full.py b/tests/gem5/configs/realview-switcheroo-full.py
similarity index 100%
rename from tests/configs/realview-switcheroo-full.py
rename to tests/gem5/configs/realview-switcheroo-full.py
diff --git a/tests/configs/realview-switcheroo-noncaching-timing.py b/tests/gem5/configs/realview-switcheroo-noncaching-timing.py
similarity index 100%
rename from tests/configs/realview-switcheroo-noncaching-timing.py
rename to tests/gem5/configs/realview-switcheroo-noncaching-timing.py
diff --git a/tests/configs/realview-switcheroo-o3.py b/tests/gem5/configs/realview-switcheroo-o3.py
similarity index 100%
rename from tests/configs/realview-switcheroo-o3.py
rename to tests/gem5/configs/realview-switcheroo-o3.py
diff --git a/tests/configs/realview-switcheroo-timing.py b/tests/gem5/configs/realview-switcheroo-timing.py
similarity index 100%
rename from tests/configs/realview-switcheroo-timing.py
rename to tests/gem5/configs/realview-switcheroo-timing.py
diff --git a/tests/configs/realview64-minor-dual.py b/tests/gem5/configs/realview64-minor-dual.py
similarity index 100%
rename from tests/configs/realview64-minor-dual.py
rename to tests/gem5/configs/realview64-minor-dual.py
diff --git a/tests/configs/realview64-minor.py b/tests/gem5/configs/realview64-minor.py
similarity index 100%
rename from tests/configs/realview64-minor.py
rename to tests/gem5/configs/realview64-minor.py
diff --git a/tests/configs/realview64-o3-checker.py b/tests/gem5/configs/realview64-o3-checker.py
similarity index 100%
rename from tests/configs/realview64-o3-checker.py
rename to tests/gem5/configs/realview64-o3-checker.py
diff --git a/tests/configs/realview64-o3-dual.py b/tests/gem5/configs/realview64-o3-dual.py
similarity index 100%
rename from tests/configs/realview64-o3-dual.py
rename to tests/gem5/configs/realview64-o3-dual.py
diff --git a/tests/configs/realview64-o3.py b/tests/gem5/configs/realview64-o3.py
similarity index 100%
rename from tests/configs/realview64-o3.py
rename to tests/gem5/configs/realview64-o3.py
diff --git a/tests/configs/realview64-simple-atomic-checkpoint.py b/tests/gem5/configs/realview64-simple-atomic-checkpoint.py
similarity index 100%
rename from tests/configs/realview64-simple-atomic-checkpoint.py
rename to tests/gem5/configs/realview64-simple-atomic-checkpoint.py
diff --git a/tests/configs/realview64-simple-atomic-dual.py b/tests/gem5/configs/realview64-simple-atomic-dual.py
similarity index 100%
rename from tests/configs/realview64-simple-atomic-dual.py
rename to tests/gem5/configs/realview64-simple-atomic-dual.py
diff --git a/tests/configs/realview64-simple-atomic.py b/tests/gem5/configs/realview64-simple-atomic.py
similarity index 100%
rename from tests/configs/realview64-simple-atomic.py
rename to tests/gem5/configs/realview64-simple-atomic.py
diff --git a/tests/configs/realview64-simple-timing-dual-ruby.py b/tests/gem5/configs/realview64-simple-timing-dual-ruby.py
similarity index 100%
rename from tests/configs/realview64-simple-timing-dual-ruby.py
rename to tests/gem5/configs/realview64-simple-timing-dual-ruby.py
diff --git a/tests/configs/realview64-simple-timing-dual.py b/tests/gem5/configs/realview64-simple-timing-dual.py
similarity index 100%
rename from tests/configs/realview64-simple-timing-dual.py
rename to tests/gem5/configs/realview64-simple-timing-dual.py
diff --git a/tests/configs/realview64-simple-timing-ruby.py b/tests/gem5/configs/realview64-simple-timing-ruby.py
similarity index 100%
rename from tests/configs/realview64-simple-timing-ruby.py
rename to tests/gem5/configs/realview64-simple-timing-ruby.py
diff --git a/tests/configs/realview64-simple-timing.py b/tests/gem5/configs/realview64-simple-timing.py
similarity index 100%
rename from tests/configs/realview64-simple-timing.py
rename to tests/gem5/configs/realview64-simple-timing.py
diff --git a/tests/configs/realview64-switcheroo-atomic.py b/tests/gem5/configs/realview64-switcheroo-atomic.py
similarity index 100%
rename from tests/configs/realview64-switcheroo-atomic.py
rename to tests/gem5/configs/realview64-switcheroo-atomic.py
diff --git a/tests/configs/realview64-switcheroo-full.py b/tests/gem5/configs/realview64-switcheroo-full.py
similarity index 100%
rename from tests/configs/realview64-switcheroo-full.py
rename to tests/gem5/configs/realview64-switcheroo-full.py
diff --git a/tests/configs/realview64-switcheroo-o3.py b/tests/gem5/configs/realview64-switcheroo-o3.py
similarity index 100%
rename from tests/configs/realview64-switcheroo-o3.py
rename to tests/gem5/configs/realview64-switcheroo-o3.py
diff --git a/tests/configs/realview64-switcheroo-timing.py b/tests/gem5/configs/realview64-switcheroo-timing.py
similarity index 100%
rename from tests/configs/realview64-switcheroo-timing.py
rename to tests/gem5/configs/realview64-switcheroo-timing.py
diff --git a/tests/configs/switcheroo.py b/tests/gem5/configs/switcheroo.py
similarity index 100%
rename from tests/configs/switcheroo.py
rename to tests/gem5/configs/switcheroo.py
diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py
index 1783439..f0ba9bd 100644
--- a/tests/gem5/fs/linux/arm/run.py
+++ b/tests/gem5/fs/linux/arm/run.py
@@ -62,7 +62,8 @@
 gem5_root = joinpath(os.path.dirname(__file__), '..', '..', '..', '..', '..')
 sys.path.append(joinpath(gem5_root, 'configs'))
 tests_root = joinpath(gem5_root, 'tests')
-sys.path.append(joinpath(tests_root, 'configs'))
+sys.path.append(joinpath(tests_root, 'gem5', 'configs'))
+
 
 exec(compile(open(config).read(), config, 'exec'))
 
diff --git a/tests/gem5/fs/linux/arm/test.py b/tests/gem5/fs/linux/arm/test.py
index a7eacec..89e9e65 100644
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -96,7 +96,7 @@
 
 for name in arm_fs_quick_tests:
     args = [
-        joinpath(config.base_dir, 'tests', 'configs', name + '.py'),
+        joinpath(config.base_dir, 'tests', 'gem5', 'configs', name + '.py'),
         path
     ]
     gem5_verify_config(
@@ -111,7 +111,7 @@
 
 for name in arm_fs_long_tests:
     args = [
-        joinpath(config.base_dir, 'tests', 'configs', name + '.py'),
+        joinpath(config.base_dir, 'tests', 'gem5', 'configs', name + '.py'),
         path
     ]
     gem5_verify_config(