diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 5993d0e6ab78..04e3cae117af 100644
--- a/nixos/tests/kernel-generic.nix
+++ b/nixos/tests/kernel-generic.nix
@@ -6,8 +6,8 @@
 with pkgs.lib;
 
 let
-  makeKernelTest = version: linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: {
-    name = "kernel-${version}";
+  makeKernelTest = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: {
+    name = "kernel-${linuxPackages.kernel.version}";
     meta = with pkgs.lib.maintainers; {
       maintainers = [ nequissimus ];
     };
@@ -23,20 +23,22 @@ let
         assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
       '';
   }) args);
-in
-with pkgs; {
-  linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
-  linux_4_9 = makeKernelTest "4.9" linuxPackages_4_9;
-  linux_4_14 = makeKernelTest "4.14" linuxPackages_4_14;
-  linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19;
-  linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
-  linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
-  linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13;
+  kernels = {
+    inherit (pkgs)
+      linuxPackages_4_4
+      linuxPackages_4_9
+      linuxPackages_4_14
+      linuxPackages_4_19
+      linuxPackages_5_4
+      linuxPackages_5_10
+      linuxPackages_5_13
 
-  linux_hardened_4_14 = makeKernelTest "4.14" linuxPackages_4_14_hardened;
-  linux_hardened_4_19 = makeKernelTest "4.19" linuxPackages_4_19_hardened;
-  linux_hardened_5_4 = makeKernelTest "5.4" linuxPackages_5_4_hardened;
-  linux_hardened_5_10 = makeKernelTest "5.10" linuxPackages_5_10_hardened;
+      linuxPackages_4_14_hardened
+      linuxPackages_4_19_hardened
+      linuxPackages_5_4_hardened
+      linuxPackages_5_10_hardened
 
-  linux_testing = makeKernelTest "testing" linuxPackages_testing;
-}
+      linuxPackages_testing;
+  };
+
+in mapAttrs (_: kernel: makeKernelTest kernel) kernels