diff --git a/Gemfile.lock b/Gemfile.lock
index 97b30f7..9890726 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,7 @@ GEM
     bson_ext (1.12.5)
       bson (~> 1.12.5)
     builder (2.1.2)
+    coderay (1.1.2)
     couch_potato (1.3.0)
       activemodel
       couchrest (~> 1.2.0)
@@ -105,10 +106,27 @@ GEM
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
+    ffi (1.9.23)
+    ffi (1.9.23-java)
+    formatador (0.2.5)
     gherkin (2.11.6)
       json (>= 1.7.6)
     gherkin (2.11.6-java)
       json (>= 1.7.6)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -118,6 +136,11 @@ GEM
     json (1.8.6)
     json (1.8.6-java)
     json_pure (1.8.1)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
     mime-types (1.25.1)
     mongo (1.12.5)
       bson (= 1.12.5)
@@ -138,6 +161,7 @@ GEM
     multipart-post (2.0.0)
     mysql (2.9.1)
     mysql2 (0.3.18)
+    nenv (0.3.0)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
       activesupport
@@ -153,13 +177,26 @@ GEM
     nest (1.1.2)
       redis
     net-http-persistent (2.9.4)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     ohm (0.1.5)
       nest (~> 1.0)
     os (0.9.6)
     pg (0.18.2)
     plucky (0.5.2)
       mongo (~> 1.5)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry (0.11.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+      spoon (~> 0.0)
     rake (11.1.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rdoc (4.1.2)
       json (~> 1.4)
     redis (3.1.0)
@@ -180,8 +217,12 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     sequel (3.21.0)
+    shellany (0.0.1)
+    spoon (0.0.6)
+      ffi
     sqlite3 (1.3.10)
     stringex (1.5.1)
+    thor (0.20.0)
     tzinfo (0.3.48)
     uuidtools (2.1.5)
     zip (2.0.2)
@@ -201,7 +242,9 @@ DEPENDENCIES
   datamapper
   dm-migrations
   dm-sqlite-adapter
+  guard-rspec
   json_pure
+  listen (~> 3.0.0)
   mongo (~> 1.12.0)
   mongo_ext
   mongo_mapper
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..7b6ade9
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,6 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch("spec/spec_helper.rb")  { "spec" }
+end
+
diff --git a/database_cleaner.gemspec b/database_cleaner.gemspec
index 90cd42b..d42a97e 100644
--- a/database_cleaner.gemspec
+++ b/database_cleaner.gemspec
@@ -51,6 +51,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "couch_potato"
   s.add_development_dependency "sequel", "~> 3.21.0"
   s.add_development_dependency 'ohm', '~> 0.1.3'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency "listen", "~> 3.0.0" # 3.1 requires Ruby >= 2.2
   s.add_development_dependency "rspec"
   s.add_development_dependency "cucumber"