diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..2cd45cb
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,11 @@
+notification :off
+
+guard 'rake', :task => 'test' do
+  watch('Rakefile')
+  watch(%r{^manifests\/(.+)\.pp$})
+  watch(%r{^templates\/(.+)\.erb$})
+end
+
+guard 'rake', :task => 'metadata' do
+  watch('metadata.json')
+end