diff --git a/Gemfile b/Gemfile
index 2fa9d33a1..51880d3a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -153,7 +153,7 @@ group :test do
   gem 'fixture_builder', '0.3.3'
   gem 'fuubar', '>= 1.0'
   gem 'rspec-instafail', '>= 0.1.7', :require => false
-  gem 'selenium-webdriver', '~> 2.22.1'
+  gem 'selenium-webdriver', '~> 2.25'
 
   gem 'webmock', '~> 1.7', :require => false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index cc976fc81..783f99fbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,8 +124,8 @@ GEM
     carrierwave (0.6.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     client_side_validations (3.1.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -174,7 +174,7 @@ GEM
     faraday_middleware (0.8.7)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
-    ffi (1.0.11)
+    ffi (1.1.5)
     fixture_builder (0.3.3)
       activerecord (>= 2)
       activesupport (>= 2)
@@ -261,7 +261,7 @@ GEM
     kgio (2.7.4)
     launchy (2.1.0)
       addressable (~> 2.2.6)
-    libwebsocket (0.1.3)
+    libwebsocket (0.1.5)
       addressable
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -413,9 +413,8 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.22.2)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
@@ -546,7 +545,7 @@ DEPENDENCIES
   ruby-debug
   ruby-oembed (~> 0.8.7)
   sass-rails (= 3.2.5)
-  selenium-webdriver (~> 2.22.1)
+  selenium-webdriver (~> 2.25)
   settingslogic!
   spork (~> 1.0rc2)
   thin (~> 1.3.1)