diff --git a/Gemfile b/Gemfile
index 64c527c19237..d42b033edbc3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,7 +91,7 @@ group :test do
   gem 'selenium-webdriver',    '>= 2.5.0'
   gem 'capybara',              '1.1.2'
   gem 'delorean'
-  gem 'webrick',               '1.3.1'
+  gem 'webrick',               '1.8.1'
   gem 'mocha',                 '1.1.0'
   gem 'ci_reporter',           '1.8.4'
   gem 'poltergeist',           '>= 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d02a6592c158..e5cc5011d838 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,6 +96,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.2.2)
     daemons (1.2.3)
     db-query-matchers (0.4.0)
     dbf (2.0.6)
@@ -155,7 +156,8 @@ GEM
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     instagram (1.1.6)
       faraday (>= 0.7, < 0.10)
@@ -163,7 +165,7 @@ GEM
       hashie (>= 0.4.0)
       multi_json (~> 1.0, >= 1.0.3)
     journey (1.0.4)
-    json (1.8.3)
+    json (1.8.6)
     jwt (1.5.4)
     kgio (2.10.0)
     launchy (2.4.3)
@@ -182,7 +184,7 @@ GEM
     mock_redis (0.16.0)
     mono_logger (1.1.0)
     msgpack (0.7.4)
-    multi_json (1.11.2)
+    multi_json (1.15.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-ldap (0.11)
@@ -201,7 +203,7 @@ GEM
     polyglot (0.3.5)
     power_assert (0.2.7)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.14.0)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
@@ -320,7 +322,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
-    thor (0.19.1)
+    thor (1.2.2)
     thread_safe (0.3.5)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -349,7 +351,7 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.6)
       rack (>= 1.0)
-    webrick (1.3.1)
+    webrick (1.8.1)
     websocket (1.2.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -430,7 +432,7 @@ DEPENDENCIES
   uuidtools (= 2.1.5)
   virtus (= 1.0.5)
   vizzuality-sequel-rails (= 0.3.7)!
-  webrick (= 1.3.1)
+  webrick (= 1.8.1)
 
 BUNDLED WITH
    1.11.2