diff --git a/tests/firewall.nix b/tests/firewall.nix
index 060dbb6082c5..316ee439b454 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -41,7 +41,7 @@
       $walled->succeed("ping -c 1 attacker >&2");
 
       # If we stop the firewall, then connections should succeed.
-      $walled->succeed("stop firewall");
+      $walled->stopJob("firewall");
       $attacker->succeed("curl -v http://walled/ >&2");
     '';
 
diff --git a/tests/nat.nix b/tests/nat.nix
index 24f390f24cbb..ca02fa137d49 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -63,7 +63,7 @@
       $router->succeed("ping -c 1 client >&2");
 
       # If we turn off NAT, the client shouldn't be able to reach the server.
-      $router->succeed("stop nat");
+      $router->stopJob("nat");
       $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
       $client->fail("ping -c 1 server >&2");
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index fbd0adab2fac..796c300423d6 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -28,9 +28,8 @@ rec {
     { server =
         { config, pkgs, ... }:
 
-        { jobs.quake3Server =
-            { name = "quake3-server";
-              startOn = "startup";
+        { jobs."quake3-server" =
+            { startOn = "startup";
               exec =
                 "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
@@ -74,7 +73,7 @@ rec {
 
       $client1->shutdown();
       $client2->shutdown();
-      $server->succeed("stop quake3-server");
+      $server->stopJob("quake3-server");
     '';
 
 }