diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp
index 8e2da16510..ed668dd993 100644
--- a/modules/openstack_project/manifests/proposal_slave.pp
+++ b/modules/openstack_project/manifests/proposal_slave.pp
@@ -31,7 +31,7 @@ class openstack_project::proposal_slave (
   package { ['Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1',
              'pyyaml', 'requestsexceptions']:
     ensure   => latest,
-    provider => pip,
+    provider => openstack_pip,
     require  => Class['pip'],
   }
 
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index a6dec4b59e..824fc8250d 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -163,7 +163,7 @@ class openstack_project::puppetmaster (
 # For launch/launch-node.py.
   package { 'shade':
     ensure   => latest,
-    provider => pip,
+    provider => openstack_pip,
   }
   package { 'python-paramiko':
     ensure => present,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 2ca7d53965..7e50f47f24 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -244,7 +244,7 @@ class openstack_project::template (
   }
   package { 'virtualenv':
     ensure   => $virtualenv_ensure,
-    provider => pip,
+    provider => openstack_pip,
     require  => Class['pip'],
   }
 
diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp
index d43676751d..67f2d808e5 100644
--- a/modules/openstack_project/manifests/thick_slave.pp
+++ b/modules/openstack_project/manifests/thick_slave.pp
@@ -61,7 +61,7 @@ class openstack_project::thick_slave(
   # for pushing files to swift and uploading to pypi with twine
   package { 'requests':
     ensure   => latest,
-    provider => pip,
+    provider => openstack_pip,
   }
   if ($::osfamily == 'RedHat') {
     # Work around https://bugzilla.redhat.com/show_bug.cgi?id=973375