diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
index 0db512bf99dc..646d70cdd337 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
@@ -41,6 +41,10 @@ import ./generic.nix (
         killOption 'CONFIG_.*_DEBUG.*'
         killOption 'CONFIG_DEBUG.*'
         killOption CONFIG_AUDIT_ARCH
+        killOption CONFIG_PERF_COUNTERS
+        killOption 'CONFIG_GCOV.*'
+        killOption 'CONFIG_KGDB.*'
+        killOption 'CONFIG_.*_TEST'
         
         killOption CONFIG_KERNEL_BZIP2
         killOption CONFIG_KERNEL_LZMA
diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
index 89ccadf10ceb..1fb33fdc2638 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
@@ -42,6 +42,10 @@ in
     killOption 'CONFIG_.*_DEBUG.*'
     killOption 'CONFIG_DEBUG.*'
     killOption CONFIG_AUDIT_ARCH
+    killOption CONFIG_PERF_COUNTERS
+    killOption 'CONFIG_GCOV.*'
+    killOption 'CONFIG_KGDB.*'
+    killOption 'CONFIG_.*_TEST'
     
     killOption CONFIG_KERNEL_BZIP2
     killOption CONFIG_KERNEL_LZMA