diff --git a/Gemfile b/Gemfile
index 994b12da782a3daa2fe5709d4226362d568266e0..2f4925ef1ea0b54d07d3501cc20c4da6c66586e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -282,7 +282,7 @@ group :test do
 
   # Cucumber (integration tests)
 
-  gem "capybara",           "2.15.1"
+  gem "capybara",           "2.18.0"
   gem "database_cleaner",   "1.6.1"
   gem "poltergeist",        "1.16.0"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5de26733903f2be6f7eaa11c2ee48347a125a509..fb83b834d0a3b5809b980b02f9b0b72bdea76d16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,13 +72,13 @@ GEM
     buftok (0.2.0)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (2.15.1)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     carrierwave (1.2.2)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
@@ -756,8 +756,8 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
     yard (0.9.12)
 
 PLATFORMS
@@ -773,7 +773,7 @@ DEPENDENCIES
   autoprefixer-rails (= 8.2.0)
   bootstrap-sass (= 3.3.7)
   bootstrap-switch-rails (= 3.3.3)
-  capybara (= 2.15.1)
+  capybara (= 2.18.0)
   carrierwave (= 1.2.2)
   compass-rails (= 3.0.2)
   configurate (= 0.3.1)