diff --git a/Gemfile b/Gemfile
index b2d66d8f..ef5a4bf3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,8 +67,6 @@ gem 'axlsx_rails'
 gem 'd3_rails'
 gem 'chart-js-rails'
 
-# We use coveralls for measuring test coverage
-gem 'coveralls', require: false
 # Use a self-hosted errbit with the old notifier
 gem 'hoptoad_notifier', '~> 2.3'
 
@@ -84,15 +82,8 @@ gem 'font-awesome-rails'
 #Use Redcarpet for Markdown in description
 gem 'redcarpet'
 
-# Use rspec and capybara as testing framework
-group :development, :test do
-  gem 'rspec', '>= 3.0.0.beta'
-  gem 'rspec-rails', '>= 3.0.0.beta'
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'capybara-webkit'
-  gem 'shoulda'
-end
+# Rubyracer is JavaScript Runtime of choice
+gem 'therubyracer'
 
 # FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/
 gem 'protected_attributes'
@@ -121,3 +112,15 @@ group :development do
   # Use letter_opener to open mails in development
   gem 'letter_opener'
 end
+
+# Use rspec and capybara as testing framework
+group :test do
+  # We use coveralls for measuring test coverage
+  gem 'coveralls', require: false
+  gem 'rspec-rails'
+  gem 'capybara'
+  gem 'database_cleaner'
+  gem 'poltergeist'
+  # Set of rails validations matchers to describe models
+  gem 'shoulda'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a8f57d1..597b895c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,9 +68,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.1.1)
-      capybara (~> 2.0, >= 2.0.2)
-      json
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -80,6 +77,7 @@ GEM
       railties (> 3.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
+    cliver (0.3.2)
     cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
     cocoon (1.2.6)
@@ -99,7 +97,7 @@ GEM
       thor
     d3_rails (3.4.6)
       railties (>= 3.1.0)
-    database_cleaner (1.2.0)
+    database_cleaner (1.3.0)
     devise (3.2.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -166,6 +164,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.2.0)
       launchy (~> 2.2)
+    libv8 (3.16.14.3)
     listen (2.7.2)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)
@@ -222,6 +221,11 @@ GEM
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     pdf-core (0.2.5)
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
     powerpack (0.0.9)
     prawn (1.0.0)
@@ -274,34 +278,31 @@ GEM
       rdoc (~> 4.0)
       yajl-ruby (~> 1.1)
     redcarpet (3.1.2)
+    ref (1.0.5)
     referer-parser (0.2.1)
     request_store (1.0.6)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (3.0.0.beta2)
-      rspec-core (= 3.0.0.beta2)
-      rspec-expectations (= 3.0.0.beta2)
-      rspec-mocks (= 3.0.0.beta2)
-    rspec-collection_matchers (0.0.4)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-expectations (3.0.0.beta2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.0.0.beta2)
-    rspec-mocks (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-rails (3.0.0.beta2)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.0)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (= 3.0.0.beta2)
-      rspec-expectations (= 3.0.0.beta2)
-      rspec-mocks (= 3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-support (3.0.0.beta2)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
     rubocop (0.22.0)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.9)
@@ -344,6 +345,9 @@ GEM
     sqlite3 (1.3.9)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -365,6 +369,7 @@ GEM
     uuidtools (2.1.4)
     warden (1.2.3)
       rack (>= 1.0)
+    websocket-driver (0.3.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.0)
@@ -382,7 +387,6 @@ DEPENDENCIES
   bootstrap-sass
   cancan
   capybara
-  capybara-webkit
   chart-js-rails
   cocoon
   coveralls
@@ -408,6 +412,7 @@ DEPENDENCIES
   omniauth-openid
   paper_trail
   paperclip
+  poltergeist
   prawn_rails
   protected_attributes
   quiet_assets
@@ -415,13 +420,13 @@ DEPENDENCIES
   rails-observers
   rdoc-generator-fivefish
   redcarpet
-  rspec (>= 3.0.0.beta)
-  rspec-rails (>= 3.0.0.beta)
+  rspec-rails
   rubocop
   sass-rails (>= 4.0.2)
   shoulda
   spring-commands-rspec
   sqlite3
+  therubyracer
   transitions
   turbolinks
   uglifier (>= 1.3.0)