diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 782a50956f79..3d145cc32abe 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -180,7 +180,7 @@ sub waitForJob {
     my ($self, $jobName) = @_;
     while (1) {
         my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /\(start\)\s+running/;
+        return if $out =~ /start\/running/;
         sleep 1;
         # !!! need a timeout
     }
@@ -204,7 +204,7 @@ sub stopJob {
     $self->execute("initctl stop $jobName");
     while (1) {
         my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /\(stop\)\s+waiting/;
+        return if $out =~ /stop\/waiting/;
         sleep 1;
         # !!! need a timeout
     }
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 64f7729cd733..a573d2b9f909 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
   config = {
 
     jobs.backdoor =
-      { startOn = "network-interfaces";
+      { startOn = "started network-interfaces";
         
         preStart =
           ''