diff --git a/manifests/worker.pp b/manifests/worker.pp
index c700daa..566964f 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -96,6 +96,17 @@ if ! defined(File['/var/log/subunit2sql']) {
     ],
   }
 
+  if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
+    # This is a hack to make sure that systemd is aware of the new service
+    # before we attempt to start it.
+    exec { "jenkins-subunit-worker${suffix}-systemd-daemon-reload":
+      command     => '/bin/systemctl daemon-reload',
+      before      => Service["jenkins-subunit-worker${suffix}"],
+      subscribe   => File["/etc/init.d/jenkins-subunit-worker${suffix}"],
+      refreshonly => true,
+    }
+  }
+
   service { "jenkins-subunit-worker${suffix}":
     enable     => true,
     hasrestart => true,
diff --git a/templates/jenkins-subunit-worker.init.erb b/templates/jenkins-subunit-worker.init.erb
index 08e6551..f77376a 100755
--- a/templates/jenkins-subunit-worker.init.erb
+++ b/templates/jenkins-subunit-worker.init.erb
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          jenkins-subunit-worker
+# Provides:          jenkins-subunit-worker<%= suffix %>
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5