diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b932dd0f6cf0..541d31e82599 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -516,7 +516,7 @@ in
   ghostunnel = handleTest ./ghostunnel.nix { };
   gitdaemon = handleTest ./gitdaemon.nix { };
   gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };
-  github-runner = handleTest ./github-runner.nix { };
+  github-runner = runTest ./github-runner.nix;
   gitlab = runTest ./gitlab.nix;
   gitolite = handleTest ./gitolite.nix { };
   gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix { };
diff --git a/nixos/tests/github-runner.nix b/nixos/tests/github-runner.nix
index ffc0dbcc374b..847da352ca6c 100644
--- a/nixos/tests/github-runner.nix
+++ b/nixos/tests/github-runner.nix
@@ -1,49 +1,47 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "github-runner";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ veehaitch ];
-    };
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.github-runners.test = {
-          enable = true;
-          url = "https://github.com/yaxitech";
-          tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
-        };
-
-        services.github-runners.test-disabled = {
-          enable = false;
-          url = "https://github.com/yaxitech";
-          tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
-        };
-
-        systemd.services.dummy-github-com = {
-          wantedBy = [ "multi-user.target" ];
-          before = [ "github-runner-test.service" ];
-          script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
-        };
-        networking.hosts."127.0.0.1" = [ "api.github.com" ];
+{ pkgs, ... }:
+{
+  name = "github-runner";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ veehaitch ];
+  };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.github-runners.test = {
+        enable = true;
+        url = "https://github.com/yaxitech";
+        tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
       };
 
-    testScript = ''
-      start_all()
+      services.github-runners.test-disabled = {
+        enable = false;
+        url = "https://github.com/yaxitech";
+        tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
+      };
 
-      machine.wait_for_unit("dummy-github-com")
+      systemd.services.dummy-github-com = {
+        wantedBy = [ "multi-user.target" ];
+        before = [ "github-runner-test.service" ];
+        script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
+      };
+      networking.hosts."127.0.0.1" = [ "api.github.com" ];
+    };
 
-      try:
-        machine.wait_for_unit("github-runner-test")
-      except Exception:
-        pass
+  testScript = ''
+    start_all()
 
-      out = machine.succeed("journalctl -u github-runner-test")
-      assert "Self-hosted runner registration" in out, "did not read runner registration header"
+    machine.wait_for_unit("dummy-github-com")
 
-      machine.wait_until_succeeds("test -f /tmp/registration-connect")
+    try:
+      machine.wait_for_unit("github-runner-test")
+    except Exception:
+      pass
 
-      machine.fail("systemctl list-unit-files | grep test-disabled")
-    '';
-  }
-)
+    out = machine.succeed("journalctl -u github-runner-test")
+    assert "Self-hosted runner registration" in out, "did not read runner registration header"
+
+    machine.wait_until_succeeds("test -f /tmp/registration-connect")
+
+    machine.fail("systemctl list-unit-files | grep test-disabled")
+  '';
+}