diff --git a/Gemfile b/Gemfile
index 920b4a433c..6ace6a8b97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -106,7 +106,7 @@ group :test, :development do
   gem 'rspec-rails', ">= 3.5.2"
   gem 'shoulda-matchers'
   gem 'factory_girl_rails', :require => false
-  gem 'capybara'
+  gem 'capybara', '>= 2.15.4'
   gem 'database_cleaner', '0.7.1', :require => false
   gem 'awesome_print'
   gem 'letter_opener'
@@ -130,6 +130,7 @@ group :development do
   gem 'pry-byebug', '>= 3.4.3'
   gem 'debugger-linecache'
   gem 'guard'
+  gem 'listen', '3.0.8' # 3.1.0 requires ruby 2.2
   gem 'guard-livereload'
   gem 'rack-livereload'
   gem 'guard-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 231caa5bbb..4e849fdb19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,8 @@ GEM
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
     acts_as_list (0.1.9)
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     andand (1.3.3)
     angular-rails-templates (0.2.0)
       railties (>= 3.1)
@@ -200,15 +201,13 @@ GEM
     builder (3.0.4)
     byebug (9.0.6)
     cancan (1.6.8)
-    capybara (2.7.1)
+    capybara (2.15.4)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
     chronic (0.10.2)
     chunky_png (1.3.4)
     climate_control (0.1.0)
@@ -283,7 +282,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffaker (1.15.0)
-    ffi (1.9.3)
+    ffi (1.9.18)
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
@@ -409,11 +408,14 @@ GEM
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
-    guard (2.2.4)
+    guard (2.14.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-livereload (2.5.2)
@@ -467,16 +469,16 @@ GEM
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
     libv8 (3.16.14.11)
-    listen (2.2.0)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.12)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.9.0)
     mime-types (1.25.1)
+    mini_mime (0.1.4)
     mini_portile2 (2.1.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
@@ -485,9 +487,13 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
+    nenv (0.3.0)
     newrelic_rpm (3.12.0.288)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -523,12 +529,13 @@ GEM
       activerecord (~> 3.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
-    pry (0.11.1)
+    pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.4.3)
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
+    public_suffix (3.0.0)
     rabl (0.7.2)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
@@ -567,9 +574,9 @@ GEM
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.2.3)
@@ -631,6 +638,7 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.5.10)
       thor (~> 0.14)
+    shellany (0.0.1)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
     spinjs-rails (1.3)
@@ -647,10 +655,9 @@ GEM
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.4)
+    thor (0.20.0)
     tilt (1.4.1)
     timecop (0.8.1)
-    timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -691,7 +698,7 @@ GEM
     wicked_pdf (1.1.0)
     wkhtmltopdf-binary (0.12.3.1)
     xml-simple (1.1.5)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -711,7 +718,7 @@ DEPENDENCIES
   blockenspiel
   bugsnag
   byebug (~> 9.0.0)
-  capybara
+  capybara (>= 2.15.4)
   coffee-rails (~> 3.2.1)
   compass-rails
   css_splitter
@@ -748,6 +755,7 @@ DEPENDENCIES
   jwt (~> 1.5)
   knapsack
   letter_opener
+  listen (= 3.0.8)
   momentjs-rails
   newrelic_rpm
   nokogiri (>= 1.6.7.1)