diff --git a/Gemfile b/Gemfile
index 7813f84..231ae64 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'rabl',   '~> 0.6'
 
 group :development, :test do
   gem 'rspec-rails',        '~> 2.6'
-  gem 'capybara',           '~> 1.1'
+  gem 'capybara',           '~> 2.2'
   gem 'factory_girl_rails', '~> 4.4'
   gem 'shoulda-matchers',   '~> 1.0'
 end
diff --git a/spec/integration/home_spec.rb b/spec/features/home_spec.rb
similarity index 100%
rename from spec/integration/home_spec.rb
rename to spec/features/home_spec.rb
diff --git a/spec/integration/playlists_spec.rb b/spec/features/playlists_spec.rb
similarity index 100%
rename from spec/integration/playlists_spec.rb
rename to spec/features/playlists_spec.rb
diff --git a/spec/integration/tracks_spec.rb b/spec/features/tracks_spec.rb
similarity index 100%
rename from spec/integration/tracks_spec.rb
rename to spec/features/tracks_spec.rb
diff --git a/spec/integration/user_sign_in_spec.rb b/spec/features/user_sign_in_spec.rb
similarity index 100%
rename from spec/integration/user_sign_in_spec.rb
rename to spec/features/user_sign_in_spec.rb
diff --git a/spec/integration/user_sign_up_spec.rb b/spec/features/user_sign_up_spec.rb
similarity index 100%
rename from spec/integration/user_sign_up_spec.rb
rename to spec/features/user_sign_up_spec.rb