diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a9b33559d1c7..2763d4fec108 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -798,7 +798,7 @@ in {
   nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
   nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {};
   node-red = handleTest ./node-red.nix {};
-  nomad = handleTest ./nomad.nix {};
+  nomad = runTest ./nomad.nix;
   non-default-filesystems = handleTest ./non-default-filesystems.nix {};
   non-switchable-system = runTest ./non-switchable-system.nix;
   noto-fonts = handleTest ./noto-fonts.nix {};
diff --git a/nixos/tests/nomad.nix b/nixos/tests/nomad.nix
index ee94b5301d0e..dd4c49feed00 100644
--- a/nixos/tests/nomad.nix
+++ b/nixos/tests/nomad.nix
@@ -1,104 +1,102 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "nomad";
-    nodes = {
-      default_server =
-        { pkgs, lib, ... }:
-        {
-          networking = {
-            interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
-              {
-                address = "192.168.1.1";
-                prefixLength = 16;
-              }
-            ];
-          };
-
-          environment.etc."nomad.custom.json".source = (pkgs.formats.json { }).generate "nomad.custom.json" {
-            region = "universe";
-            datacenter = "earth";
-          };
-
-          services.nomad = {
-            enable = true;
-
-            settings = {
-              server = {
-                enabled = true;
-                bootstrap_expect = 1;
-              };
-            };
-
-            extraSettingsPaths = [ "/etc/nomad.custom.json" ];
-            enableDocker = false;
-          };
+{ lib, ... }:
+{
+  name = "nomad";
+  nodes = {
+    default_server =
+      { pkgs, lib, ... }:
+      {
+        networking = {
+          interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
+            {
+              address = "192.168.1.1";
+              prefixLength = 16;
+            }
+          ];
         };
 
-      custom_state_dir_server =
-        { pkgs, lib, ... }:
-        {
-          networking = {
-            interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
-              {
-                address = "192.168.1.1";
-                prefixLength = 16;
-              }
-            ];
-          };
-
-          environment.etc."nomad.custom.json".source = (pkgs.formats.json { }).generate "nomad.custom.json" {
-            region = "universe";
-            datacenter = "earth";
-          };
-
-          services.nomad = {
-            enable = true;
-            dropPrivileges = false;
-
-            settings = {
-              data_dir = "/nomad/data/dir";
-              server = {
-                enabled = true;
-                bootstrap_expect = 1;
-              };
-            };
-
-            extraSettingsPaths = [ "/etc/nomad.custom.json" ];
-            enableDocker = false;
-          };
-
-          systemd.services.nomad.serviceConfig.ExecStartPre = "${pkgs.writeShellScript "mk_data_dir" ''
-            set -euxo pipefail
-
-            ${pkgs.coreutils}/bin/mkdir -p /nomad/data/dir
-          ''}";
+        environment.etc."nomad.custom.json".source = (pkgs.formats.json { }).generate "nomad.custom.json" {
+          region = "universe";
+          datacenter = "earth";
         };
-    };
 
-    testScript = ''
-      def test_nomad_server(server):
-          server.wait_for_unit("nomad.service")
+        services.nomad = {
+          enable = true;
 
-          # wait for healthy server
-          server.wait_until_succeeds(
-              "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]"
-          )
+          settings = {
+            server = {
+              enabled = true;
+              bootstrap_expect = 1;
+            };
+          };
 
-          # wait for server liveness
-          server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]")
+          extraSettingsPaths = [ "/etc/nomad.custom.json" ];
+          enableDocker = false;
+        };
+      };
 
-          # check the region
-          server.succeed("nomad server members | grep -o universe")
+    custom_state_dir_server =
+      { pkgs, lib, ... }:
+      {
+        networking = {
+          interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
+            {
+              address = "192.168.1.1";
+              prefixLength = 16;
+            }
+          ];
+        };
 
-          # check the datacenter
-          server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]")
+        environment.etc."nomad.custom.json".source = (pkgs.formats.json { }).generate "nomad.custom.json" {
+          region = "universe";
+          datacenter = "earth";
+        };
+
+        services.nomad = {
+          enable = true;
+          dropPrivileges = false;
+
+          settings = {
+            data_dir = "/nomad/data/dir";
+            server = {
+              enabled = true;
+              bootstrap_expect = 1;
+            };
+          };
+
+          extraSettingsPaths = [ "/etc/nomad.custom.json" ];
+          enableDocker = false;
+        };
+
+        systemd.services.nomad.serviceConfig.ExecStartPre = "${pkgs.writeShellScript "mk_data_dir" ''
+          set -euxo pipefail
+
+          ${pkgs.coreutils}/bin/mkdir -p /nomad/data/dir
+        ''}";
+      };
+  };
+
+  testScript = ''
+    def test_nomad_server(server):
+        server.wait_for_unit("nomad.service")
+
+        # wait for healthy server
+        server.wait_until_succeeds(
+            "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]"
+        )
+
+        # wait for server liveness
+        server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]")
+
+        # check the region
+        server.succeed("nomad server members | grep -o universe")
+
+        # check the datacenter
+        server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]")
 
 
-      servers = [default_server, custom_state_dir_server]
+    servers = [default_server, custom_state_dir_server]
 
-      for server in servers:
-          test_nomad_server(server)
-    '';
-  }
-)
+    for server in servers:
+        test_nomad_server(server)
+  '';
+}