diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py
index 6606de6bd1..4ca479981a 100644
--- a/tests/configs/arm_generic.py
+++ b/tests/configs/arm_generic.py
@@ -94,6 +94,7 @@ class LinuxArmSystemBuilder(object):
 
         default_kernels = {
             "VExpress_GEM5_V1": gem5_kernel,
+            "VExpress_GEM5_Foundation": gem5_kernel,
         }
 
         sc = SysConfig(None, self.mem_size, [disk_image], "/dev/sda")
@@ -122,7 +123,7 @@ class LinuxArmFSSystem(LinuxArmSystemBuilder,
     """Basic ARM full system builder."""
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         """Initialize an ARM system that supports full system simulation.
@@ -153,7 +154,7 @@ class LinuxArmFSSystemUniprocessor(LinuxArmSystemBuilder,
     """
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         BaseFSSystemUniprocessor.__init__(self, **kwargs)
@@ -164,7 +165,7 @@ class LinuxArmFSSwitcheroo(LinuxArmSystemBuilder, BaseFSSwitcheroo):
     """Uniprocessor ARM system prepared for CPU switching"""
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         BaseFSSwitcheroo.__init__(self, **kwargs)
diff --git a/tests/configs/realview-minor-dual.py b/tests/configs/realview-minor-dual.py
index 036ec322d9..bb4fe172e9 100644
--- a/tests/configs/realview-minor-dual.py
+++ b/tests/configs/realview-minor-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=MinorCPU,
diff --git a/tests/configs/realview-minor.py b/tests/configs/realview-minor.py
index 4db30ac2f3..0bee6cafb2 100644
--- a/tests/configs/realview-minor.py
+++ b/tests/configs/realview-minor.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=MinorCPU).create_root()
diff --git a/tests/configs/realview-o3-checker.py b/tests/configs/realview-o3-checker.py
index 3f20d07dcf..4809581a7b 100644
--- a/tests/configs/realview-o3-checker.py
+++ b/tests/configs/realview-o3-checker.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3,
diff --git a/tests/configs/realview-o3-dual.py b/tests/configs/realview-o3-dual.py
index 6e569c90f6..52695e8740 100644
--- a/tests/configs/realview-o3-dual.py
+++ b/tests/configs/realview-o3-dual.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=O3_ARM_v7a_3,
diff --git a/tests/configs/realview-o3.py b/tests/configs/realview-o3.py
index b680673304..e984049a77 100644
--- a/tests/configs/realview-o3.py
+++ b/tests/configs/realview-o3.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3).create_root()
diff --git a/tests/configs/realview-simple-atomic-checkpoint.py b/tests/configs/realview-simple-atomic-checkpoint.py
index 9c61deb060..d994ca5052 100644
--- a/tests/configs/realview-simple-atomic-checkpoint.py
+++ b/tests/configs/realview-simple-atomic-checkpoint.py
@@ -40,6 +40,7 @@ from arm_generic import *
 import checkpoint
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
diff --git a/tests/configs/realview-simple-atomic-dual.py b/tests/configs/realview-simple-atomic-dual.py
index 6ba4977222..47bbcc772b 100644
--- a/tests/configs/realview-simple-atomic-dual.py
+++ b/tests/configs/realview-simple-atomic-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='atomic',
                         mem_class=SimpleMemory,
                         cpu_class=AtomicSimpleCPU,
diff --git a/tests/configs/realview-simple-atomic.py b/tests/configs/realview-simple-atomic.py
index 79835999b8..659c18e1b7 100644
--- a/tests/configs/realview-simple-atomic.py
+++ b/tests/configs/realview-simple-atomic.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()
diff --git a/tests/configs/realview-simple-timing-dual-ruby.py b/tests/configs/realview-simple-timing-dual-ruby.py
index 8cb452d30a..63860c5b5b 100644
--- a/tests/configs/realview-simple-timing-dual-ruby.py
+++ b/tests/configs/realview-simple-timing-dual-ruby.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
diff --git a/tests/configs/realview-simple-timing-dual.py b/tests/configs/realview-simple-timing-dual.py
index 7f3d384ff1..59ce2c70e0 100644
--- a/tests/configs/realview-simple-timing-dual.py
+++ b/tests/configs/realview-simple-timing-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,
diff --git a/tests/configs/realview-simple-timing-ruby.py b/tests/configs/realview-simple-timing-ruby.py
index 099b401277..94e4274668 100644
--- a/tests/configs/realview-simple-timing-ruby.py
+++ b/tests/configs/realview-simple-timing-ruby.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU,
diff --git a/tests/configs/realview-simple-timing.py b/tests/configs/realview-simple-timing.py
index d60a25db84..e130e20a9f 100644
--- a/tests/configs/realview-simple-timing.py
+++ b/tests/configs/realview-simple-timing.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU).create_root()
diff --git a/tests/configs/realview-switcheroo-full.py b/tests/configs/realview-switcheroo-full.py
index 7747f9b83c..9d8ac5784e 100644
--- a/tests/configs/realview-switcheroo-full.py
+++ b/tests/configs/realview-switcheroo-full.py
@@ -38,6 +38,7 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
+    machine_type='VExpress_GEM5_V1',
     aarch64_kernel=False,
     mem_class=DDR3_1600_8x8,
     cpu_classes=(AtomicSimpleCPU, TimingSimpleCPU, MinorCPU, DerivO3CPU)
diff --git a/tests/configs/realview-switcheroo-o3.py b/tests/configs/realview-switcheroo-o3.py
index b6bbec1592..7424f40353 100644
--- a/tests/configs/realview-switcheroo-o3.py
+++ b/tests/configs/realview-switcheroo-o3.py
@@ -39,6 +39,7 @@ import switcheroo
 
 root = LinuxArmFSSwitcheroo(
     aarch64_kernel=False,
+    machine_type='VExpress_GEM5_V1',
     mem_class=DDR3_1600_8x8,
     cpu_classes=(DerivO3CPU, DerivO3CPU)
     ).create_root()