diff --git a/nixos/tests/tang.nix b/nixos/tests/tang.nix
index 0241b62dd3c7..d82b30af99f8 100644
--- a/nixos/tests/tang.nix
+++ b/nixos/tests/tang.nix
@@ -48,44 +48,44 @@
     };
   testScript = ''
     start_all()
-    machine.wait_for_unit("sockets.target")
+    server.wait_for_unit("sockets.target")
 
     with subtest("Check keys are generated"):
-      machine.wait_until_succeeds("curl -v http://127.0.0.1:7654/adv")
-      key = machine.wait_until_succeeds("tang-show-keys 7654")
+      server.wait_until_succeeds("curl -v http://127.0.0.1:7654/adv")
+      key = server.wait_until_succeeds("tang-show-keys 7654")
 
     with subtest("Check systemd access list"):
-      machine.succeed("ping -c 3 192.168.0.1")
-      machine.fail("curl -v --connect-timeout 3 http://192.168.0.1:7654/adv")
+      server.succeed("ping -c 3 192.168.0.1")
+      server.fail("curl -v --connect-timeout 3 http://192.168.0.1:7654/adv")
 
     with subtest("Check basic encrypt and decrypt message"):
-      machine.wait_until_succeeds(f"""echo 'Hello World' | clevis encrypt tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}"}}' > /tmp/encrypted""")
-      decrypted = machine.wait_until_succeeds("clevis decrypt < /tmp/encrypted")
+      server.wait_until_succeeds(f"""echo 'Hello World' | clevis encrypt tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}"}}' > /tmp/encrypted""")
+      decrypted = server.wait_until_succeeds("clevis decrypt < /tmp/encrypted")
       assert decrypted.strip() == "Hello World"
-      machine.wait_until_succeeds("tang-show-keys 7654")
+      server.wait_until_succeeds("tang-show-keys 7654")
 
     with subtest("Check encrypt and decrypt disk"):
-      machine.succeed("cryptsetup luksFormat --force-password --batch-mode /dev/vdb <<<'password'")
-      machine.succeed(f"""clevis luks bind -s1 -y -f -d /dev/vdb tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}" }}' <<< 'password' """)
-      clevis_luks = machine.succeed("clevis luks list -d /dev/vdb")
+      server.succeed("cryptsetup luksFormat --force-password --batch-mode /dev/vdb <<<'password'")
+      server.succeed(f"""clevis luks bind -s1 -y -f -d /dev/vdb tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}" }}' <<< 'password' """)
+      clevis_luks = server.succeed("clevis luks list -d /dev/vdb")
       assert clevis_luks.strip() == """1: tang '{"url":"http://127.0.0.1:7654"}'"""
-      machine.succeed("clevis luks unlock -d /dev/vdb")
-      machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
-      machine.succeed("clevis luks unlock -d /dev/vdb")
-      machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
+      server.succeed("clevis luks unlock -d /dev/vdb")
+      server.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
+      server.succeed("clevis luks unlock -d /dev/vdb")
+      server.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
       # without tang available, unlock should fail
-      machine.succeed("systemctl stop tangd.socket")
-      machine.fail("clevis luks unlock -d /dev/vdb")
-      machine.succeed("systemctl start tangd.socket")
+      server.succeed("systemctl stop tangd.socket")
+      server.fail("clevis luks unlock -d /dev/vdb")
+      server.succeed("systemctl start tangd.socket")
 
     with subtest("Rotate server keys"):
-      machine.succeed("${pkgs.tang}/libexec/tangd-rotate-keys -d /var/lib/tang")
-      machine.succeed("clevis luks unlock -d /dev/vdb")
-      machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
+      server.succeed("${pkgs.tang}/libexec/tangd-rotate-keys -d /var/lib/tang")
+      server.succeed("clevis luks unlock -d /dev/vdb")
+      server.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +")
 
     with subtest("Test systemd service security"):
-        output = machine.succeed("systemd-analyze security tangd@.service")
-        machine.log(output)
+        output = server.succeed("systemd-analyze security tangd@.service")
+        server.log(output)
         assert output[-9:-1] == "SAFE :-}"
   '';
 }