diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b932dd0f6cf0..5afd2b4bf279 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -741,7 +741,7 @@ in
   magnetico = handleTest ./magnetico.nix { };
   mailcatcher = runTest ./mailcatcher.nix;
   mailhog = handleTest ./mailhog.nix { };
-  mailpit = handleTest ./mailpit.nix { };
+  mailpit = runTest ./mailpit.nix;
   mailman = handleTest ./mailman.nix { };
   man = handleTest ./man.nix { };
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
diff --git a/nixos/tests/mailpit.nix b/nixos/tests/mailpit.nix
index 887f700ae684..5f92b5030fda 100644
--- a/nixos/tests/mailpit.nix
+++ b/nixos/tests/mailpit.nix
@@ -1,35 +1,33 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "mailpit";
-    meta.maintainers = lib.teams.flyingcircus.members;
+{ lib, ... }:
+{
+  name = "mailpit";
+  meta.maintainers = lib.teams.flyingcircus.members;
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.mailpit.instances.default = { };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.mailpit.instances.default = { };
 
-        environment.systemPackages = with pkgs; [ swaks ];
-      };
+      environment.systemPackages = with pkgs; [ swaks ];
+    };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      from json import loads
+    from json import loads
 
-      machine.wait_for_unit("mailpit-default.service")
-      machine.wait_for_open_port(1025)
-      machine.wait_for_open_port(8025)
-      machine.succeed(
-          'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
-      )
+    machine.wait_for_unit("mailpit-default.service")
+    machine.wait_for_open_port(1025)
+    machine.wait_for_open_port(8025)
+    machine.succeed(
+        'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
+    )
 
-      received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages"))
-      assert received['total'] == 1
-      message = received["messages"][0]
-      assert len(message['To']) == 1
-      assert message['To'][0]['Address'] == 'root@example.org'
-      assert "this is the body of the email" in message['Snippet']
-    '';
-  }
-)
+    received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages"))
+    assert received['total'] == 1
+    message = received["messages"][0]
+    assert len(message['To']) == 1
+    assert message['To'][0]['Address'] == 'root@example.org'
+    assert "this is the body of the email" in message['Snippet']
+  '';
+}