diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb
index 7a53e927c..bdcc8ad1e 100644
--- a/lib/puppet/provider/keystone.rb
+++ b/lib/puppet/provider/keystone.rb
@@ -2,7 +2,7 @@ require 'puppet/util/inifile'
 require 'puppet/provider/openstack'
 require 'puppet/provider/openstack/auth'
 require 'puppet/provider/openstack/credentials'
-require 'puppet/provider/keystone/util'
+require File.join(File.dirname(__FILE__), '..','..', 'puppet/provider/keystone/util')
 
 class Puppet::Provider::Keystone < Puppet::Provider::Openstack
 
diff --git a/lib/puppet/provider/keystone_domain/openstack.rb b/lib/puppet/provider/keystone_domain/openstack.rb
index 465f8cbc9..3190e2340 100644
--- a/lib/puppet/provider/keystone_domain/openstack.rb
+++ b/lib/puppet/provider/keystone_domain/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 require 'puppet/util/inifile'
 
 Puppet::Type.type(:keystone_domain).provide(
diff --git a/lib/puppet/provider/keystone_endpoint/openstack.rb b/lib/puppet/provider/keystone_endpoint/openstack.rb
index 3d88a92d2..46ba2c469 100644
--- a/lib/puppet/provider/keystone_endpoint/openstack.rb
+++ b/lib/puppet/provider/keystone_endpoint/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 Puppet::Type.type(:keystone_endpoint).provide(
   :openstack,
diff --git a/lib/puppet/provider/keystone_identity_provider/openstack.rb b/lib/puppet/provider/keystone_identity_provider/openstack.rb
index 1db71088d..2bb7ace28 100644
--- a/lib/puppet/provider/keystone_identity_provider/openstack.rb
+++ b/lib/puppet/provider/keystone_identity_provider/openstack.rb
@@ -1,5 +1,5 @@
 require 'json'
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 class Puppet::Error::OpenstackDuplicateRemoteId < Puppet::Error; end
 
diff --git a/lib/puppet/provider/keystone_role/openstack.rb b/lib/puppet/provider/keystone_role/openstack.rb
index b002178db..60e3496b2 100644
--- a/lib/puppet/provider/keystone_role/openstack.rb
+++ b/lib/puppet/provider/keystone_role/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 Puppet::Type.type(:keystone_role).provide(
   :openstack,
diff --git a/lib/puppet/provider/keystone_service/openstack.rb b/lib/puppet/provider/keystone_service/openstack.rb
index e49a40218..848fdd303 100644
--- a/lib/puppet/provider/keystone_service/openstack.rb
+++ b/lib/puppet/provider/keystone_service/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 Puppet::Type.type(:keystone_service).provide(
   :openstack,
diff --git a/lib/puppet/provider/keystone_tenant/openstack.rb b/lib/puppet/provider/keystone_tenant/openstack.rb
index 2dea4a4d8..2e06f7905 100644
--- a/lib/puppet/provider/keystone_tenant/openstack.rb
+++ b/lib/puppet/provider/keystone_tenant/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 Puppet::Type.type(:keystone_tenant).provide(
   :openstack,
diff --git a/lib/puppet/provider/keystone_user/openstack.rb b/lib/puppet/provider/keystone_user/openstack.rb
index d974181cc..7dfe80eb7 100644
--- a/lib/puppet/provider/keystone_user/openstack.rb
+++ b/lib/puppet/provider/keystone_user/openstack.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/keystone'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
 
 Puppet::Type.type(:keystone_user).provide(
   :openstack,
diff --git a/lib/puppet/provider/keystone_user_role/openstack.rb b/lib/puppet/provider/keystone_user_role/openstack.rb
index c96cb4597..eee0768e7 100644
--- a/lib/puppet/provider/keystone_user_role/openstack.rb
+++ b/lib/puppet/provider/keystone_user_role/openstack.rb
@@ -1,6 +1,6 @@
-require 'puppet/provider/keystone'
-require 'puppet/provider/keystone/util'
-require 'puppet_x/keystone/composite_namevar'
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone/util')
+require File.join(File.dirname(__FILE__), '..','..','..', 'puppet_x/keystone/composite_namevar')
 
 Puppet::Type.type(:keystone_user_role).provide(
   :openstack,