diff --git a/Guardfile b/Guardfile
new file mode 100644
index 000000000..b6e8538ee
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,5 @@
+notification :off
+
+guard 'rake', :task => 'test' do
+  watch(%r{^manifests\/.+\.pp$})
+end