diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 58434f3ab3..85efb5fcb0 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -5,6 +5,7 @@ class jenkins::slave(
   $sudo = false,
   $bare = false,
   $user = true,
+  $python3 = false,
 ) {
 
   include pip
@@ -132,10 +133,19 @@ class jenkins::slave(
     'tox',
   ]
 
-  package { $pip_packages:
-    ensure   => latest,  # we want the latest from these
-    provider => pip,
-    require  => Class[pip],
+  if $python3 {
+    include pip::python3
+    package { $pip_packages:
+      ensure   => latest,  # we want the latest from these
+      provider => pip3,
+      require  => Class[pip::python3],
+    }
+  } else {
+    package { $pip_packages:
+      ensure   => latest,  # we want the latest from these
+      provider => pip,
+      require  => Class[pip],
+    }
   }
 
   package { 'python-subunit':
diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 538aa61faa..eb8b818a2b 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -4,7 +4,8 @@ class openstack_project::slave (
   $bare = false,
   $certname = $::fqdn,
   $ssh_key = '',
-  $sysadmins = []
+  $sysadmins = [],
+  $python3 = false
 ) {
   include openstack_project
   include openstack_project::tmpcleanup
@@ -17,6 +18,7 @@ class openstack_project::slave (
   class { 'jenkins::slave':
     bare    => $bare,
     ssh_key => $ssh_key,
+    python3 => $python3,
   }
   class { 'salt':
     salt_master => 'ci-puppetmaster.openstack.org',