diff --git a/Gemfile b/Gemfile
index 5eec4796..c4513b04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,7 @@ gem 'yard', '~> 0.9.11', require: false
 gem 'addressable', '~> 2.4', require: false
 gem 'aruba', '~> 0.14.0', require: false
 gem 'byebug'
+gem 'capybara', '~> 2.5.0', require: false
 gem 'cucumber', '~> 3.0', require: false
 gem 'rspec', '~> 3.0', require: false
 
@@ -32,10 +33,6 @@ gem 'stylus', '>= 1.0', require: false
 # Dns server to test preview server
 gem 'rubydns', '~> 1.0.1', require: false
 
-# To test javascript
-gem 'phantomjs', '~> 2.1.1.0', require: false
-gem 'poltergeist', '~> 1.8', require: false
-
 # For less, note there is no compatible JS runtime for windows
 gem 'therubyracer', '~> 0.12.3', platforms: :ruby
 gem 'therubyrhino', '>= 2.0', platforms: :jruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 93b97802..53b576f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,13 +53,12 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (3.7.1)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      xpath (~> 3.1)
+    capybara (2.5.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
@@ -67,7 +66,6 @@ GEM
       nio4r (>= 1.1.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    cliver (0.3.2)
     coderay (1.1.2)
     coffee-script (2.4.1)
       coffee-script-source
@@ -121,7 +119,9 @@ GEM
       ruby_dep (~> 1.2)
     memoist (0.16.0)
     method_source (0.9.0)
-    mini_mime (1.0.1)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
@@ -139,11 +139,6 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
-    phantomjs (2.1.1.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -234,11 +229,8 @@ GEM
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    xpath (3.1.0)
-      nokogiri (~> 1.8)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
     yard (0.9.16)
 
 PLATFORMS
@@ -248,6 +240,7 @@ DEPENDENCIES
   addressable (~> 2.4)
   aruba (~> 0.14.0)
   byebug
+  capybara (~> 2.5.0)
   coffee-script (~> 2.2)
   cucumber (~> 3.0)
   haml (>= 4.0.5)
@@ -255,8 +248,6 @@ DEPENDENCIES
   liquid (>= 3.0)
   middleman-cli!
   middleman-core!
-  phantomjs (~> 2.1.1.0)
-  poltergeist (~> 1.8)
   pry
   pry-rescue
   pry-stack_explorer
diff --git a/middleman-cli/features/support/env.rb b/middleman-cli/features/support/env.rb
index e800237d..3e14c957 100644
--- a/middleman-cli/features/support/env.rb
+++ b/middleman-cli/features/support/env.rb
@@ -6,9 +6,6 @@ require 'sassc'
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'phantomjs/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
 require 'simplecov'
 SimpleCov.start
 
diff --git a/middleman-core/features/javascript-testing.feature b/middleman-core/features/javascript-testing.feature
deleted file mode 100644
index 031d70d0..00000000
--- a/middleman-core/features/javascript-testing.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-Feature: Test a site with javascript included
-
-  As a software developer
-  I want to develop a site using javascript
-  I would like to have a server step rendering javascript correctly in order to test it
-
-  @javascript
-  Scenario: Existing app with javascript
-    Given the Server is running at "javascript-app"
-    When I go to "/index.html"
-    Then I should see:
-    """
-    Local Hour
-    """
-    And I should see:
-    """
-    Local Minutes
-    """
diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb
index 29cfa75e..ac7e5491 100644
--- a/middleman-core/features/support/env.rb
+++ b/middleman-core/features/support/env.rb
@@ -6,10 +6,7 @@ require 'sassc'
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'phantomjs/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
-Capybara.server = :webrick
+# Capybara.server = :webrick
 
 require 'simplecov'
 SimpleCov.start
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index dc0d209e..fad4f32a 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -37,9 +37,6 @@ Gem::Specification.new do |s|
   # Watcher
   s.add_dependency('listen', ['~> 3.0'])
 
-  # Tests
-  s.add_development_dependency('capybara', ['~> 2.5.0'])
-
   # i18n
   s.add_dependency('i18n', ['~> 0.7'])