diff --git a/Gemfile b/Gemfile
index ed8ea2b..f7ae8ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,8 +47,8 @@ end
 group :test do
   gem "rake",                          '~> 10.0.4'
   gem 'factory_girl_rails',            '~> 4.2.0'
-  gem 'capybara',                      '~> 2.1.0'
-  gem 'poltergeist',                   '~> 1.3.0'
+  gem 'capybara',                      '~> 2.2.0'
+  gem 'poltergeist',                   '~> 1.5.0'
   gem 'database_cleaner',              '~> 1.0.1'
   gem 'guard'
   gem 'guard-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1491174..ede7939 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capybara (2.1.0)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -63,6 +63,7 @@ GEM
       activesupport (>= 3.2.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    cliver (0.3.1)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -94,8 +95,6 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    faye-websocket (0.4.7)
-      eventmachine (>= 0.12.0)
     ffi (1.9.3)
     fog (1.9.0)
       builder
@@ -122,7 +121,6 @@ GEM
     hashie (2.0.5)
     highline (1.6.19)
     hike (1.2.3)
-    http_parser.rb (0.5.3)
     httpauth (0.2.0)
     i18n (0.6.9)
     jasmine-core (1.3.1)
@@ -186,10 +184,11 @@ GEM
     open4 (1.3.0)
     parallel (0.7.1)
     pg (0.17.0)
-    poltergeist (1.3.0)
-      capybara (~> 2.1.0)
-      faye-websocket (>= 0.4.4, < 0.5.0)
-      http_parser.rb (~> 0.5.3)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
     protected_attributes (1.0.5)
       activemodel (>= 4.0.1, < 5.0)
@@ -300,6 +299,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    websocket-driver (0.3.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -315,7 +315,7 @@ DEPENDENCIES
   cane (~> 2.5.2)
   capistrano (~> 2.15)
   capistrano-ext (~> 1.2)
-  capybara (~> 2.1.0)
+  capybara (~> 2.2.0)
   carrierwave (~> 0.8.0)
   coffee-rails (~> 4.0.1)
   dalli (~> 2.6.2)
@@ -336,7 +336,7 @@ DEPENDENCIES
   omniauth-twitter (~> 0.0.16)
   open4 (~> 1.3.0)
   pg (~> 0.14)
-  poltergeist (~> 1.3.0)
+  poltergeist (~> 1.5.0)
   protected_attributes (~> 1.0.5)
   pry-rails (~> 0.3.2)
   quiet_assets (~> 1.0.1)