diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 838a04b0577b..8535c8d10062 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -319,7 +319,7 @@ in
   clatd = runTest ./clatd.nix;
   clickhouse = import ./clickhouse { inherit runTest; };
   cloud-init = runTest ./cloud-init.nix;
-  cloud-init-hostname = handleTest ./cloud-init-hostname.nix { };
+  cloud-init-hostname = runTest ./cloud-init-hostname.nix;
   cloudlog = runTest ./cloudlog.nix;
   cntr = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cntr.nix { };
   cockpit = runTest ./cockpit.nix;
diff --git a/nixos/tests/cloud-init-hostname.nix b/nixos/tests/cloud-init-hostname.nix
index c3d71e8ef0d5..0f0c0b20d426 100644
--- a/nixos/tests/cloud-init-hostname.nix
+++ b/nixos/tests/cloud-init-hostname.nix
@@ -1,12 +1,4 @@
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
+{ lib, pkgs, ... }:
 let
   # Hostname can also be set through "hostname" in user-data.
   # This is how proxmox configures hostname through cloud-init.
@@ -27,16 +19,13 @@ let
       ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
     '';
   };
-
 in
-makeTest {
+{
   name = "cloud-init-hostname";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [
-      lewo
-      illustris
-    ];
-  };
+  meta.maintainers = with lib.maintainers; [
+    lewo
+    illustris
+  ];
 
   nodes.machine2 =
     { ... }: