diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 780e4314c..8905ba2fa 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -518,6 +518,7 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None,
     # Command line
     self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 ' + \
                         'root=/dev/hda1'
+    self.kernel = binary('x86_64-vmlinux-2.6.22.9')
     return self
 
 
diff --git a/tests/configs/x86_generic.py b/tests/configs/x86_generic.py
index d30087df1..5dc8702ba 100644
--- a/tests/configs/x86_generic.py
+++ b/tests/configs/x86_generic.py
@@ -60,7 +60,6 @@ class LinuxX86SystemBuilder(object):
         system = FSConfig.makeLinuxX86System(self.mem_mode,
                                              numCPUs=self.num_cpus,
                                              mdesc=mdesc)
-        system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9')
 
         self.init_system(system)
         return system