diff --git a/Guardfile b/Guardfile
index ab2c6c7..45cbf98 100644
--- a/Guardfile
+++ b/Guardfile
@@ -13,9 +13,14 @@ def startup_guards
   watch(%r{^spec/spec_helper\.rb$})         { yield }
 end
 
+def all_specs
+  'spec'
+end
+
 group :rspec do
   guard 'rspec', guard_opts do
-    startup_guards { 'spec' }
+    startup_guards { all_specs }
+    watch(%r{^helpers/(.+)\.rb$}) { all_specs }
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^(libraries|providers)/(.+)\.rb$}) do |m|
       "spec/#{m[1]}/#{m[2]}_spec.rb"
diff --git a/spec/keystone_config.rb b/spec/helpers/keystone_config.rb
similarity index 92%
rename from spec/keystone_config.rb
rename to spec/helpers/keystone_config.rb
index 4bb32ac..fb74135 100644
--- a/spec/keystone_config.rb
+++ b/spec/helpers/keystone_config.rb
@@ -1,4 +1,4 @@
-require ::File.join(::File.dirname(__FILE__), *%w(.. libraries cib_objects))
+require ::File.join(::File.dirname(__FILE__), *%w(.. .. libraries cib_objects))
 
 module Chef::RSpec
   module Pacemaker
diff --git a/spec/libraries/cib_objects_spec.rb b/spec/libraries/cib_objects_spec.rb
index d628df5..d181a66 100644
--- a/spec/libraries/cib_objects_spec.rb
+++ b/spec/libraries/cib_objects_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 require_relative File.join(%w(.. .. libraries cib_objects))
-require_relative File.join(%w(.. keystone_config))
+require_relative File.join(%w(.. helpers keystone_config))
 
 describe Chef::Libraries::Pacemaker::CIBObjects do
   include Chef::Libraries::Pacemaker::CIBObjects
diff --git a/spec/providers/primitive_spec.rb b/spec/providers/primitive_spec.rb
index 4dfb70c..8e9fd52 100644
--- a/spec/providers/primitive_spec.rb
+++ b/spec/providers/primitive_spec.rb
@@ -1,6 +1,6 @@
 require 'chef/application'
 require_relative File.join(%w(.. spec_helper))
-require_relative File.join(%w(.. keystone_config))
+require_relative File.join(%w(.. helpers keystone_config))
 
 describe "Chef::Provider::PacemakerPrimitive" do
   before do