diff --git a/release.nix b/release.nix
index c14e8bc7e605..f4decf594dcc 100644
--- a/release.nix
+++ b/release.nix
@@ -252,6 +252,7 @@ in {
       ipv6 = runTest (t: t.ipv6.test);
       kde4 = runTest (t: t.kde4.test);
       login = runTest (t: t.login.test);
+      latestKernel.login = runTest (t: t.latestKernel.login.test);
       misc = runTest (t: t.misc.test);
       mpich = runTest (t: t.mpich.test);
       mysql = runTest (t: t.mysql.test);
diff --git a/tests/default.nix b/tests/default.nix
index d2e08a258e95..798fdf9817a9 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -10,7 +10,8 @@ with import ../lib/testing.nix { inherit system minimal; };
   installer = makeTests (import ./installer.nix);
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
-  login = makeTest (import ./login.nix);
+  login = makeTest (import ./login.nix {});
+  latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
   misc = makeTest (import ./misc.nix);
   mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
diff --git a/tests/login.nix b/tests/login.nix
index cdd6414744a6..ed7d97867179 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+config: { pkgs, ... }:
 
 {
 
-  machine = { config, pkgs, ... }: { };
+  machine = config;
 
   testScript =
     ''