diff --git a/Gemfile b/Gemfile
index 066d1959e..77d32c4b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -195,13 +195,13 @@ group :development do
   # Automatic test runs
   gem 'guard-cucumber', '1.5.1'
   gem 'guard-rspec',    '4.3.1'
-  gem 'guard',          '2.7.3', :require => false
+  gem 'guard',          '2.8.2', :require => false
   gem 'rb-fsevent',     '0.9.4', :require => false
   gem 'rb-inotify',     '0.9.5', :require => false
 
   # Preloading environment
 
-  gem 'guard-spork', '1.5.1'
+  gem 'guard-spork', '2.0.1'
   gem 'spork',       '1.0.0rc4'
 
   # Debugging
diff --git a/Gemfile.lock b/Gemfile.lock
index 6573ae662..4b26acbe9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,7 +245,7 @@ GEM
       json
       multi_json
       request_store (>= 1.0.5)
-    guard (2.7.3)
+    guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -257,9 +257,9 @@ GEM
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    guard-spork (1.5.1)
+    guard-spork (2.0.1)
       childprocess (>= 0.2.3)
-      guard (>= 1.1)
+      guard (~> 2.8.2)
       spork (>= 0.8.4)
     haml (4.0.5)
       tilt
@@ -307,7 +307,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
-    listen (2.7.11)
+    listen (2.8.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -627,10 +627,10 @@ DEPENDENCIES
   foreman (= 0.62)
   fuubar (= 2.0.0)
   gon (= 5.2.3)
-  guard (= 2.7.3)
+  guard (= 2.8.2)
   guard-cucumber (= 1.5.1)
   guard-rspec (= 4.3.1)
-  guard-spork (= 1.5.1)
+  guard-spork (= 2.0.1)
   haml (= 4.0.5)
   handlebars_assets (= 0.18.0)
   http_accept_language (= 2.0.2)