diff --git a/Gemfile b/Gemfile
index a3d5af0b6..c188e47a1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'logstasher', '0.9.0'
 
 group :test do
   gem 'capybara', '2.2.1'
-  gem 'poltergeist', '1.5.0'
+  gem 'poltergeist', '1.15.0'
   gem 'database_cleaner', '1.6.1'
   gem 'factory_girl_rails', '4.8.0'
   gem 'mocha', '1.2.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 34ff74524..9dafbc673 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,20 +153,19 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.6.1)
+    mini_portile2 (2.2.0)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     mysql2 (0.3.17)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     null_logger (0.0.1)
     orm_adapter (0.5.0)
     plek (2.0.0)
-    poltergeist (1.5.0)
+    poltergeist (1.15.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
     quiet_assets (1.1.0)
@@ -260,11 +259,13 @@ GEM
     webmock (1.17.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.4.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     whenever (0.9.7)
       chronic (>= 0.6.3)
     xml-simple (1.1.4)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
     zxcvbn-ruby (0.0.2)
 
@@ -298,7 +299,7 @@ DEPENDENCIES
   mocha (= 1.2.1)
   mysql2
   plek (= 2.0.0)
-  poltergeist (= 1.5.0)
+  poltergeist (= 1.15.0)
   quiet_assets
   rails (~> 3.2.22)
   rails_12factor