diff --git a/tests/gem5/configs/realview-switcheroo-o3.py b/tests/gem5/configs/realview-switcheroo-o3.py
index fe3298f1d6..4fca57ea1e 100644
--- a/tests/gem5/configs/realview-switcheroo-o3.py
+++ b/tests/gem5/configs/realview-switcheroo-o3.py
@@ -41,7 +41,7 @@ root = LinuxArmFSSwitcheroo(
     aarch64_kernel=False,
     machine_type="VExpress_GEM5_V1",
     mem_class=DDR3_1600_8x8,
-    cpu_classes=(ArmDerivO3CPU, ArmDerivO3CPU),
+    cpu_classes=(ArmO3CPU, ArmO3CPU),
 ).create_root()
 
 # Setup a custom test method that uses the switcheroo tester that
diff --git a/tests/gem5/configs/realview64-switcheroo-o3.py b/tests/gem5/configs/realview64-switcheroo-o3.py
index ddfc73a12a..f899337a8f 100644
--- a/tests/gem5/configs/realview64-switcheroo-o3.py
+++ b/tests/gem5/configs/realview64-switcheroo-o3.py
@@ -38,7 +38,7 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
-    mem_class=DDR3_1600_8x8, cpu_classes=(ArmDerivO3CPU, ArmDerivO3CPU)
+    mem_class=DDR3_1600_8x8, cpu_classes=(ArmO3CPU, ArmO3CPU)
 ).create_root()
 
 # Setup a custom test method that uses the switcheroo tester that