diff --git a/manifests/site.pp b/manifests/site.pp
index 596f0d8da4..108f55add4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -402,8 +402,11 @@ node /^logstash-worker\d+\.openstack\.org$/ {
 # Node-OS: trusty
 node /^subunit-worker\d+\.openstack\.org$/ {
   $group = "subunit-worker"
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22],
+    sysadmins                 => hiera('sysadmins', []),
+  }
   class { 'openstack_project::subunit_worker':
-    sysadmins           => hiera('sysadmins', []),
     subunit2sql_db_host => hiera('subunit2sql_db_host', ''),
     subunit2sql_db_pass => hiera('subunit2sql_db_password', ''),
   }
diff --git a/modules/openstack_project/manifests/subunit_worker.pp b/modules/openstack_project/manifests/subunit_worker.pp
index a7a7d681a7..fd71d587c9 100644
--- a/modules/openstack_project/manifests/subunit_worker.pp
+++ b/modules/openstack_project/manifests/subunit_worker.pp
@@ -15,15 +15,9 @@
 # subunit2sql worker glue class.
 #
 class openstack_project::subunit_worker (
-  $sysadmins = [],
   $subunit2sql_db_host,
   $subunit2sql_db_pass,
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22],
-    sysadmins                 => $sysadmins,
-  }
-
   include subunit2sql
   subunit2sql::worker { 'A':
     config_file        => 'puppet:///modules/openstack_project/logstash/jenkins-subunit-worker.yaml',