diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py
index 722749c..7ffa141 100644
--- a/tests/configs/arm_generic.py
+++ b/tests/configs/arm_generic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -46,6 +46,8 @@
 from common.cores.arm.O3_ARM_v7a import *
 from common.Benchmarks import SysConfig
 
+from common import SysPaths
+
 class ArmSESystemUniprocessor(BaseSESystemUniprocessor):
     """Syscall-emulation builder for ARM uniprocessor systems.
 
@@ -95,6 +97,20 @@
         system.panic_on_panic = True
         system.panic_on_oops = True
 
+        default_kernels = {
+            "RealViewPBX": "vmlinux.arm.smp.fb.2.6.38.8",
+            "VExpress_EMM": "vmlinux.aarch32.ll_20131205.0-gem5",
+            "VExpress_EMM64": "vmlinux.aarch64.20140821",
+        }
+        system.kernel = SysPaths.binary(default_kernels[self.machine_type])
+        default_dtbs = {
+           "RealViewPBX": None,
+           "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.{}cpu.dtb" \
+             .format(self.num_cpus),
+           "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
+        }
+        system.dtb_filename = SysPaths.binary(default_dtbs[self.machine_type])
+
         self.init_system(system)
         return system