diff --git a/tests/nixos.nix b/tests/nixos.nix
index f4f079f3..b6a909ad 100644
--- a/tests/nixos.nix
+++ b/tests/nixos.nix
@@ -35,6 +35,7 @@ testers.runNixOSTest {
       users.users.test = {
         isNormalUser = true;
         home = "/home/test";
+        uid = 1000;
       };
 
       virtualisation = {
@@ -47,10 +48,24 @@ testers.runNixOSTest {
       };
     };
 
-  testScript = _: ''
-    machine.start()
-    machine.wait_for_unit("home-manager-test.service")
-    machine.wait_until_succeeds("systemctl status home-manager-test.service")
-    machine.succeed("echo \"system started!\"")
-  '';
+  testScript =
+    { nodes, ... }:
+    let
+      user = nodes.machine.users.users.test;
+    in
+    ''
+      start_all()
+
+      with subtest("Wait for user login"):
+        machine.wait_for_unit("multi-user.target")
+        machine.wait_for_unit("user@${toString user.uid}.service")
+
+      with subtest("Activate home-manager environment"):
+        # HACK: Re-run home-manager activation
+        #
+        # As of 24.11, home-manager is activated via a oneshot unit
+        # `wait_for_unit()` can't handle this, so we run here again with `systemctl`
+        # https://github.com/NixOS/nixpkgs/issues/62155
+        machine.systemctl("start home-manager-${user.name}.service")
+    '';
 }