diff --git a/Gemfile b/Gemfile
index a16f8a573b..e73232cf86 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,6 +68,7 @@ group :development do
   gem 'letter_opener', '~> 1.0.0'
   gem 'rails-dev-tweaks', '~> 0.6.1'
   gem 'guard-rspec'
+  gem 'guard-cucumber'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f3ccd75ea0..8b706e754a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,6 +110,9 @@ GEM
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
+    guard-cucumber (1.2.0)
+      cucumber (>= 1.2.0)
+      guard (>= 1.1.0)
     guard-rspec (2.1.0)
       guard (>= 1.1)
       rspec (~> 2.11)
@@ -298,6 +301,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.0)
   fastercsv (~> 1.5.0)
   globalize3!
+  guard-cucumber
   guard-rspec
   guard-test
   htmldiff
diff --git a/Guardfile b/Guardfile
index 238c4ff5d7..b7c4f1e6d5 100644
--- a/Guardfile
+++ b/Guardfile
@@ -19,6 +19,12 @@ guard :rspec do
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 
+guard :cucumber do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end
+
 guard :test do
   watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})