diff --git a/Guardfile b/Guardfile
index 2cd45cb..f84d6e4 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,11 +1,13 @@
 notification :off
 
+directories %w(manifests templates spec/classes spec/defines)
+
 guard 'rake', :task => 'test' do
-  watch('Rakefile')
   watch(%r{^manifests\/(.+)\.pp$})
   watch(%r{^templates\/(.+)\.erb$})
+  watch(%r{^spec/.*_spec.rb})
 end
 
 guard 'rake', :task => 'metadata' do
   watch('metadata.json')
 end