diff --git a/test/lib/fog/identity/openstack.rb b/lib/fog/mock/identity/openstack.rb
similarity index 100%
rename from test/lib/fog/identity/openstack.rb
rename to lib/fog/mock/identity/openstack.rb
diff --git a/test/lib/fog/identity/openstack/v2.rb b/lib/fog/mock/identity/openstack/v2.rb
similarity index 100%
rename from test/lib/fog/identity/openstack/v2.rb
rename to lib/fog/mock/identity/openstack/v2.rb
diff --git a/test/lib/fog/identity/openstack/v3.rb b/lib/fog/mock/identity/openstack/v3.rb
similarity index 100%
rename from test/lib/fog/identity/openstack/v3.rb
rename to lib/fog/mock/identity/openstack/v3.rb
diff --git a/test/lib/fog/network/openstack.rb b/lib/fog/mock/network/openstack.rb
similarity index 100%
rename from test/lib/fog/network/openstack.rb
rename to lib/fog/mock/network/openstack.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 80345c851..d68e74779 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,10 +12,10 @@
 require File.expand_path('../../lib/fog/openstack', __FILE__)
 
 # Load all service specific Mock classes
-require File.expand_path('../../test/lib/fog/identity/openstack', __FILE__)
-require File.expand_path('../../test/lib/fog/identity/openstack/v2', __FILE__)
-require File.expand_path('../../test/lib/fog/identity/openstack/v3', __FILE__)
-require File.expand_path('../../test/lib/fog/network/openstack', __FILE__)
+require 'fog/mock/identity/openstack'
+require 'fog/mock/identity/openstack/v2'
+require 'fog/mock/identity/openstack/v3'
+require 'fog/mock/network/openstack'
 
 Fog.mock! if ENV["FOG_MOCK"] == "true"
 Bundler.require(:test)