diff --git a/Gemfile b/Gemfile
index 634eda63..e80314ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,8 +76,10 @@ group :test do
   gem 'rspec-rails'
   gem 'factory_girl_rails', '~> 4.0'
   gem 'faker'
-  gem 'capybara'
+  # version requirements to avoid problem http://stackoverflow.com/questions/18114544
+  gem 'capybara', '~> 2.1.0'
   # webkit and poltergeist don't seem to work yet
+  gem 'selenium-webdriver', '~> 2.35.1'
   gem 'database_cleaner'
   gem 'simplecov', require: false
   # need to include rspec components before i18n-spec or rake fails in test environment
diff --git a/Gemfile.lock b/Gemfile.lock
index d19faceb..be91e252 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,13 +62,12 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capybara (2.0.2)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.9.0)
@@ -99,7 +98,7 @@ GEM
       railties (>= 3.0.0)
     faker (1.1.2)
       i18n (~> 0.5)
-    ffi (1.4.0)
+    ffi (1.9.0)
     haml (3.1.7)
     haml-rails (0.3.5)
       actionpack (>= 3.1, < 4.1)
@@ -151,8 +150,9 @@ GEM
       activesupport (~> 3.1)
       polyamorous (~> 0.5.0)
     mime-types (1.21)
+    mini_portile (0.5.1)
     mono_logger (1.1.0)
-    multi_json (1.7.6)
+    multi_json (1.7.9)
     mysql2 (0.3.11)
     net-scp (1.1.1)
       net-ssh (>= 2.6.5)
@@ -161,7 +161,8 @@ GEM
     net-ssh (2.6.7)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.5.10)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pdf-reader (1.2.0)
       Ascii85 (~> 1.0.0)
       hashery (~> 2.0)
@@ -236,10 +237,10 @@ GEM
     select2-rails (3.4.2)
       sass-rails
       thor (~> 0.14)
-    selenium-webdriver (2.31.0)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
     simple-navigation (3.9.0)
       activesupport (>= 2.3.2)
@@ -296,7 +297,7 @@ GEM
     wikicloth (0.8.0)
       builder
       expression_parser
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -311,7 +312,7 @@ DEPENDENCIES
   bullet
   capistrano (= 2.13.5)
   capistrano-ext
-  capybara
+  capybara (~> 2.1.0)
   client_side_validations
   coffee-rails (~> 3.2.1)
   daemons
@@ -339,6 +340,7 @@ DEPENDENCIES
   ruby-prof
   sass-rails (~> 3.2.3)
   select2-rails
+  selenium-webdriver (~> 2.35.1)
   simple-navigation
   simple-navigation-bootstrap
   simple_form
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
new file mode 100644
index 00000000..45a78604
--- /dev/null
+++ b/lib/tasks/rspec.rake
@@ -0,0 +1,3 @@
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec