diff --git a/Gemfile.lock b/Gemfile.lock
index e2f6de5..7c57f30 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    berkshelf (1.4.4)
+    berkshelf (1.4.5)
       activesupport (>= 3.2.0)
       addressable
       celluloid (>= 0.14.0)
@@ -21,13 +21,13 @@ GEM
       mixlib-shellout (~> 1.1)
       multi_json (~> 1.5)
       retryable
-      ridley (~> 0.12.1)
+      ridley (~> 0.12.4)
       solve (>= 0.4.2)
       thor (~> 0.18.0)
       yajl-ruby
-    builder (3.2.0)
+    builder (3.2.2)
     bunny (0.7.9)
-    celluloid (0.14.0)
+    celluloid (0.14.1)
       timers (>= 1.0.0)
     chef (10.18.2)
       bunny (>= 0.6.0, < 0.8.0)
@@ -63,7 +63,7 @@ GEM
     erubis (2.7.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    fauxhai (1.1.0)
+    fauxhai (1.1.1)
       httparty
       net-ssh
       ohai
@@ -109,7 +109,7 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (1.1.0)
     moneta (0.6.0)
-    multi_json (1.7.3)
+    multi_json (1.7.5)
     multi_xml (0.5.3)
     multipart-post (1.2.0)
     net-http-persistent (2.8)
@@ -135,19 +135,17 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.3)
-    ridley (0.12.2)
-      activesupport (>= 3.2.0)
+    ridley (0.12.4)
       addressable
       celluloid (~> 0.14.0)
       chozo (>= 0.6.0)
       erubis
       faraday (>= 0.8.4)
-      json (>= 1.5.0)
+      hashie (>= 2.0.2)
       mixlib-authentication (>= 1.3.0)
       mixlib-config (>= 1.1.0)
       mixlib-log (>= 1.3.0)
       mixlib-shellout (>= 1.1.0)
-      multi_json (>= 1.0.4)
       net-http-persistent (>= 2.8)
       net-ssh
       retryable
diff --git a/spec/db_spec.rb b/spec/db_spec.rb
index 56de586..57b9592 100644
--- a/spec/db_spec.rb
+++ b/spec/db_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-identity::db" do
   it "installs mysql packages" do
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 8840ab4..808fe79 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-identity::default" do
 end
diff --git a/spec/register_spec.rb b/spec/register_spec.rb
index b6e8f5a..23f580f 100644
--- a/spec/register_spec.rb
+++ b/spec/register_spec.rb
@@ -1,3 +1,5 @@
+require_relative "spec_helper"
+
 describe Chef::Provider::Execute do
   before do
     @node = Chef::Node.new
diff --git a/spec/server-opensuse_spec.rb b/spec/server-opensuse_spec.rb
index 9b36108..f2365da 100644
--- a/spec/server-opensuse_spec.rb
+++ b/spec/server-opensuse_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-identity::server" do
   describe "suse" do
diff --git a/spec/server-redhat_spec.rb b/spec/server-redhat_spec.rb
index 2b54d56..ad82d6c 100644
--- a/spec/server-redhat_spec.rb
+++ b/spec/server-redhat_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-identity::server" do
   describe "redhat" do
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index 6f06825..c9e4ee4 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-identity::server" do
   describe "ubuntu" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3c2bddc..e8e164f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,13 +2,13 @@ require "chefspec"
 
 ::LOG_LEVEL = :fatal
 ::OPENSUSE_OPTS = {
-  :platform => "opensuse",
-  :version => "12.3",
+  :platform  => "opensuse",
+  :version   => "12.3",
   :log_level => ::LOG_LEVEL
 }
 ::REDHAT_OPTS = {
   :platform  => "redhat",
-  :version => "6.3",
+  :version   => "6.3",
   :log_level => ::LOG_LEVEL
 }
 ::UBUNTU_OPTS = {