diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c7e0bc102f18..d376bd404b97 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -381,7 +381,7 @@ sub waitForUnit {
 
 sub waitForJob {
     my ($self, $jobName) = @_;
-    return $self->waitForUnit($jobName . ".service");
+    return $self->waitForUnit($jobName);
 }
 
 
@@ -398,13 +398,13 @@ sub waitForFile {
 
 sub startJob {
     my ($self, $jobName) = @_;
-    $self->execute("systemctl stop $jobName.service");
+    $self->execute("systemctl stop $jobName");
     # FIXME: check result
 }
 
 sub stopJob {
     my ($self, $jobName) = @_;
-    $self->execute("systemctl stop $jobName.service");
+    $self->execute("systemctl stop $jobName");
 }