diff --git a/manifests/site.pp b/manifests/site.pp
index 989ec7fad3..291ffdd0a5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -91,7 +91,7 @@ node /^ci-backup-.*\.openstack\.org$/ {
 # Test cgroups and ulimits on precise8
 node 'precise8.slave.openstack.org' {
   include openstack_project::puppet_cron
-  include openstack_project::jenkins_slave
+  include openstack_project::slave
 
   include ulimit
   ulimit::conf { 'limit_jenkins_procs':
@@ -105,7 +105,7 @@ node 'precise8.slave.openstack.org' {
 
 node /^.*\.slave\.openstack\.org$/ {
   include openstack_project::puppet_cron
-  include openstack_project::jenkins_slave
+  include openstack_project::slave
 }
 
 node /^.*\.jclouds\.openstack\.org$/ {
diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index fb9f30c350..9c3b631a9f 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -36,7 +36,7 @@ class openstack_project::base {
   }
   exec { "dpkg:puppetlabs-release-${lsbdistcodename}.deb":
     command => "/usr/bin/dpkg -i /root/puppetlabs-release-${lsbdistcodename}.deb",
-    onlyif => "test ! -f /etc/apt/sources.list.d/puppetlabs.list",
+    onlyif => "/usr/bin/test ! -f /etc/apt/sources.list.d/puppetlabs.list",
     require => Exec["download:puppetlabs-release-${lsbdistcodename}.deb"],
   }
 }
diff --git a/modules/openstack_project/manifests/jclouds_slave.pp b/modules/openstack_project/manifests/jclouds_slave.pp
index d4dba47d55..881c6ffb8d 100644
--- a/modules/openstack_project/manifests/jclouds_slave.pp
+++ b/modules/openstack_project/manifests/jclouds_slave.pp
@@ -3,7 +3,7 @@
 class openstack_project::jclouds_slave {
   include openstack_project::base
 
-  class { '::jenkins_slave':
+  class { 'jenkins_slave':
     ssh_key => "",
     user => false
   }
diff --git a/modules/openstack_project/manifests/pypi.pp b/modules/openstack_project/manifests/pypi.pp
index 3b5c741dc5..266ff9fb67 100644
--- a/modules/openstack_project/manifests/pypi.pp
+++ b/modules/openstack_project/manifests/pypi.pp
@@ -1,6 +1,9 @@
 class openstack_project::pypi {
+  include tmpreaper
+  include apt::unattended-upgrades
+
   # include jenkins slave so that build deps are there for the pip download
-  class { '::jenkins_slave':
+  class { 'jenkins_slave':
     ssh_key => "",
     user => false
   }
diff --git a/modules/openstack_project/manifests/jenkins_slave.pp b/modules/openstack_project/manifests/slave.pp
similarity index 73%
rename from modules/openstack_project/manifests/jenkins_slave.pp
rename to modules/openstack_project/manifests/slave.pp
index f03993b4f0..2e3cc8ceac 100644
--- a/modules/openstack_project/manifests/jenkins_slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -1,10 +1,10 @@
-class openstack_project::jenkins_slave {
+class openstack_project::slave {
   include tmpreaper
   include apt::unattended-upgrades
   class { 'openstack_project::server':
     iptables_public_tcp_ports => []
   }
-  class { '::jenkins_slave':
+  class { 'jenkins_slave':
     ssh_key => $openstack_project::jenkins_ssh_key
   }
 }