diff --git a/Dockerfile b/Dockerfile
index b3a2332..850d4d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM ruby:2.2
-RUN apt-get update && apt-get install -y build-essential zlib1g-dev libsqlite3-dev nodejs nodejs-legacy npm
-
-RUN npm install phantomjs-prebuilt
-RUN ln -sf /node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs /usr/local/bin/
+RUN apt-get update && \
+  apt-get install -y build-essential zlib1g-dev libsqlite3-dev nodejs nodejs-legacy npm \
+  libxml2-dev libxslt1-dev pkg-config \
+  libqt4-webkit libqt4-dev xvfb
 
 RUN mkdir -p /app
 
@@ -10,6 +10,7 @@ WORKDIR /tmp
 
 COPY Gemfile Gemfile
 COPY Gemfile.lock Gemfile.lock
+RUN bundle config build.nokogiri --use-system-libraries
 RUN bundle install
 
 ADD . /app
diff --git a/Gemfile b/Gemfile
index 081c438..10c26f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ group :test do
   gem 'test_after_commit' # TODO remove when moving to rails 5
   gem 'database_cleaner'
   gem 'coveralls', require: false
-  gem 'poltergeist'
+  gem 'capybara-webkit'
 end
 
 # Use ActiveModel has_secure_password
diff --git a/Gemfile.lock b/Gemfile.lock
index 55e0e50..8fdeeae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,7 +47,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    cliver (0.3.2)
+    capybara-webkit (1.11.1)
+      capybara (>= 2.3.0, < 2.8.0)
+      json
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -155,11 +157,6 @@ GEM
       faraday
       multi_json
       omniauth (~> 1.0)
-    poltergeist (1.9.0)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -290,9 +287,6 @@ GEM
     validate_url (1.0.2)
       activemodel (>= 3.0.0)
       addressable
-    websocket-driver (0.6.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
     win32console (1.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -304,6 +298,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   capybara
+  capybara-webkit
   coffee-rails
   coveralls
   database_cleaner
@@ -320,7 +315,6 @@ DEPENDENCIES
   launchy
   omniauth
   omniauth-browserid
-  poltergeist
   pry
   pry-rails
   quiet_assets
@@ -340,3 +334,6 @@ DEPENDENCIES
   tzinfo-data
   uglifier
   validate_url
+
+BUNDLED WITH
+   1.11.2
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index bbcfd25..27d05a8 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,2 +1 @@
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :webkit