diff --git a/Gemfile b/Gemfile
index 6d35d93d..5ad0760c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,9 @@ group :development, :test do
   gem 'puppet-lint-numericvariable',          :require => 'false'
   gem 'json',                                 :require => 'false'
   gem 'webmock',                              :require => 'false'
+  gem 'puppet-openstack_spec_helper',
+      :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+      :require => false
 end
 
 group :system_tests do
diff --git a/spec/defaults.rb b/spec/defaults.rb
deleted file mode 100644
index 548f3b29..00000000
--- a/spec/defaults.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file contains a module to return a default set of facts and supported
-# operating systems for the tests in this module.
-module OSDefaults
-    def self.get_facts(extra_facts={})
-      { :os_service_default => '<SERVICE DEFAULT>' }.merge(extra_facts)
-    end
-
-    def self.get_supported_os
-      [
-        {
-          "operatingsystem" => "CentOS",
-          "operatingsystemrelease" =>  [
-            "7.0"
-          ]
-        },
-        {
-          "operatingsystem" => "RedHat",
-          "operatingsystemrelease" =>  [
-            "7.0"
-          ]
-        },
-        {
-          "operatingsystem" => "Fedora",
-          "operatingsystemrelease" => [
-            "21",
-            "22"
-          ]
-        },
-        {
-          "operatingsystem" =>  "Ubuntu",
-          "operatingsystemrelease" =>  [
-            "14.04"
-         ]
-        },
-        {
-          "operatingsystem" =>  "Debian",
-          "operatingsystemrelease" =>  [
-            "7",
-            "8"
-         ]
-        }
-      ]
-    end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a2ccc7bf..313923de 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,8 +3,8 @@ require 'shared_examples'
 require 'webmock/rspec'
 
 require 'rspec-puppet-facts'
+require 'puppet-openstack_spec_helper/defaults'
 include RspecPuppetFacts
-require 'defaults.rb'
 
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'