diff --git a/Gemfile b/Gemfile
index 492b309..3e28add 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,6 +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'
 end
 
 # Use ActiveModel has_secure_password
diff --git a/Gemfile.lock b/Gemfile.lock
index dc9cdea..8d8f4d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,6 +46,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    cliver (0.3.2)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -153,6 +154,11 @@ 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)
@@ -283,6 +289,9 @@ 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)
@@ -310,6 +319,7 @@ DEPENDENCIES
   launchy
   omniauth
   omniauth-browserid
+  poltergeist
   pry
   pry-rails
   quiet_assets
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
new file mode 100644
index 0000000..bbcfd25
--- /dev/null
+++ b/spec/support/capybara.rb
@@ -0,0 +1,2 @@
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist