diff --git a/manifests/burrow.pp b/manifests/burrow.pp
index b555e9f..daca842 100644
--- a/manifests/burrow.pp
+++ b/manifests/burrow.pp
@@ -1,10 +1,8 @@
 import "openstack_ci_admins_users"
-import "static_users"
 import "jenkins_slave"
 
 node default {
   include openstack_ci_admins_users
-  include static_users
   include jenkins_slave
 
   package { "python-eventlet":
diff --git a/manifests/burrow_java.pp b/manifests/burrow_java.pp
index b35d307..cb603c8 100644
--- a/manifests/burrow_java.pp
+++ b/manifests/burrow_java.pp
@@ -1,10 +1,8 @@
 import "openstack_ci_admins_users"
-import "static_users"
 import "jenkins_slave"
 
 node default {
   include openstack_ci_admins_users
-  include static_users
   include jenkins_slave
 
   package { "maven2":
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 881a8c9..fc45746 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -1,10 +1,8 @@
 import "openstack_ci_admins_users"
-import "static_users"
 import "jenkins_slave"
 
 node default {
   include openstack_ci_admins_users
-  include static_users
   include jenkins_slave
 
 package { "python-argparse":
diff --git a/manifests/libburrow.pp b/manifests/libburrow.pp
index 0b37296..2811b5b 100644
--- a/manifests/libburrow.pp
+++ b/manifests/libburrow.pp
@@ -1,10 +1,8 @@
 import "openstack_ci_admins_users"
-import "static_users"
 import "jenkins_slave"
 
 node default {
   include openstack_ci_admins_users
-  include static_users
   include jenkins_slave
 
   package { "build-essential":
diff --git a/manifests/slave.pp b/manifests/slave.pp
index 5600bbc..7011a4f 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -1,9 +1,7 @@
 import "openstack_ci_admins_users"
-import "static_users"
 import "jenkins_slave"
 
 node default {
   include openstack_ci_admins_users
-  include static_users
   include jenkins_slave
 }
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 9def058..c40f981 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -1,8 +1,10 @@
 class jenkins_slave {
 
+    jenkins_user { "jenkins" }
+
     slavecirepo { "openstack-ci":
       ensure => present,
-      require => Package[git]
+      require => [ Package[git], Jenkinsuser[jenkins] ]
     }
 
     package { "python-software-properties":
diff --git a/manifests/static_users.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp
similarity index 99%
rename from manifests/static_users.pp
rename to modules/jenkins_slave/manifests/jenkinsuser.pp
index b7cb228..8aad27c 100644
--- a/manifests/static_users.pp
+++ b/modules/jenkins_slave/manifests/jenkinsuser.pp
@@ -1,4 +1,4 @@
-class static_users {
+class jenkinsuser {
 
   group { 'jenkins':
     ensure => 'present'