diff --git a/Gemfile b/Gemfile
index c8cb3fd3b..5d32bfd68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,6 @@ group :test, :development do
   gem 'rspec-given'
   gem 'pry-rails'
   gem 'pry-nav'
-  gem 'webrick'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 528119431..eae4c8a27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,7 +472,6 @@ GEM
     uglifier (2.0.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    webrick (1.3.1)
 
 PLATFORMS
   ruby
@@ -573,4 +572,3 @@ DEPENDENCIES
   turbo-sprockets-rails3
   uglifier
   vestal_versions!
-  webrick
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index b75296a66..14eb3ee1a 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -3,7 +3,6 @@ desc "Runs the qunit test suite"
 task "qunit:test" => :environment do
 
   require "rack"
-  require "webrick"
 
   unless %x{which phantomjs > /dev/null 2>&1}
     abort "PhantomJS is not installed. Download from http://phantomjs.org"
@@ -12,7 +11,6 @@ task "qunit:test" => :environment do
   port = ENV['TEST_SERVER_PORT'] || 60099
   server = Thread.new do
     Rack::Server.start(:config => "config.ru",
-                       :Logger => WEBrick::Log.new("/dev/null"),
                        :AccessLog => [],
                        :Port => port)
   end