diff --git a/CHANGELOG.md b/CHANGELOG.md
index c529e6bf2..3b0ec3dd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - enhancements
+    + Resolve Rails 5 depreciation warnings [#167](https://github.com/wearefine/fae/issues/167)
     + Update dynamic relationships docs for pages and split out to make easier to find.
 - bugs
 
diff --git a/Gemfile b/Gemfile
index 06de02989..94223ad95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,18 +20,19 @@ gem 'carrierwave', '~> 0.10.0'
 gem 'rmagick', '~> 2.13.3', require: false
 
 group :test, :development do
-  gem 'rspec-rails', '~> 3.0.2'
+  gem 'rspec-rails', '~> 3.5.2'
   gem 'pry'
 end
 
 group :test do
   gem 'factory_girl_rails', '~> 4.4.1'
-  gem 'capybara-webkit', '~> 1.11.1'
+  gem 'capybara-webkit', '~> 1.14.0'
   gem 'capybara-screenshot'
   gem 'guard-rspec', '~> 4.3.1'
   gem 'selenium-webdriver', '~> 2.42.0'
   gem 'shoulda-matchers', require: false
   gem 'yarjuf'
+  gem 'rails-perftest', '~> 0.0.7'
   gem 'database_cleaner'
   gem 'rails-controller-testing'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 40a429ad7..96d8cbd50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,8 +110,8 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    capybara-webkit (1.11.1)
-      capybara (>= 2.3.0, < 2.8.0)
+    capybara-webkit (1.14.0)
+      capybara (>= 2.3.0, < 2.14.0)
       json
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -131,7 +131,7 @@ GEM
       railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     erubis (2.7.0)
     eventmachine (1.2.0.1)
     execjs (2.7.0)
@@ -230,7 +230,7 @@ GEM
       nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-perftest (0.0.6)
+    rails-perftest (0.0.7)
     railties (5.0.0.1)
       actionpack (= 5.0.0.1)
       activesupport (= 5.0.0.1)
@@ -245,26 +245,27 @@ GEM
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rmagick (2.13.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-rails (3.0.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     ruby-prof (0.16.2)
     ruby_dep (1.5.0)
     rubyzip (1.2.0)
@@ -335,7 +336,7 @@ DEPENDENCIES
   capistrano-rails!
   capistrano-rvm
   capybara-screenshot
-  capybara-webkit (~> 1.11.1)
+  capybara-webkit (~> 1.14.0)
   carrierwave (~> 0.10.0)
   database_cleaner
   factory_girl_rails (~> 4.4.1)
@@ -346,9 +347,9 @@ DEPENDENCIES
   mysql2
   pry
   rails-controller-testing
-  rails-perftest
+  rails-perftest (~> 0.0.7)
   rmagick (~> 2.13.3)
-  rspec-rails (~> 3.0.2)
+  rspec-rails (~> 3.5.2)
   ruby-prof
   sass
   selenium-webdriver (~> 2.42.0)
@@ -357,4 +358,4 @@ DEPENDENCIES
   yarjuf
 
 BUNDLED WITH
-   1.14.5
+   1.14.6
diff --git a/app/views/fae/shared/_form_header.html.slim b/app/views/fae/shared/_form_header.html.slim
index 2ec9ab01c..eb74b70b3 100644
--- a/app/views/fae/shared/_form_header.html.slim
+++ b/app/views/fae/shared/_form_header.html.slim
@@ -32,5 +32,5 @@ ruby:
 - if subnav.present?
   ul.content-header-subnav#js-content-header-subnav
     - subnav.each do |link, id_selector|
-      - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize('_')]
+      - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize( separator: '_')]
       li: a href="##{subnav_item[1]}" = subnav_item[0]
diff --git a/docs/contributing/local_setup.md b/docs/contributing/local_setup.md
index 397a1b961..e5856a4f5 100644
--- a/docs/contributing/local_setup.md
+++ b/docs/contributing/local_setup.md
@@ -21,7 +21,7 @@ Cd to the dummy app:
 $ cd spec/dummy
 ```
 
-Create the DB if you haven't already and migrate:
+Create the DB if you haven't already and migrate (for Rails 5 >= substitute `rails` for `rake`):
 
 ```
 $ rake db:create:all
diff --git a/gemfiles/rails_4_1.gemfile b/gemfiles/rails_4_1.gemfile
index e3dde25a9..45df54307 100644
--- a/gemfiles/rails_4_1.gemfile
+++ b/gemfiles/rails_4_1.gemfile
@@ -12,24 +12,21 @@ gem "capistrano-rails", :git => "https://github.com/wearefine/rails"
 gem "capistrano-rvm"
 gem "mysql2"
 gem "rails", "~> 4.1.0"
-gem "remotipart", "~> 1.3.1"
 
 group :test, :development do
   gem "rspec-rails", "~> 3.0.2"
   gem "pry"
-  gem "quiet_assets"
 end
 
 group :test do
   gem "factory_girl_rails", "~> 4.4.1"
-  gem "capybara-webkit", "~> 1.8"
+  gem "capybara-webkit", "~> 1.11.1"
   gem "capybara-screenshot"
   gem "guard-rspec", "~> 4.3.1"
   gem "selenium-webdriver", "~> 2.42.0"
   gem "shoulda-matchers", :require => false
   gem "yarjuf"
-  gem "database_cleaner", "~> 1.3.0"
-  gem "capybara", "~> 2.4.1"
+  gem "database_cleaner"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4_1.gemfile.lock b/gemfiles/rails_4_1.gemfile.lock
index 24bad79e0..b437f9662 100644
--- a/gemfiles/rails_4_1.gemfile.lock
+++ b/gemfiles/rails_4_1.gemfile.lock
@@ -7,7 +7,7 @@ GIT
       capistrano-bundler (~> 1.1)
 
 PATH
-  remote: ../
+  remote: ..
   specs:
     fae-rails (1.5.0)
       acts_as_list (~> 0.9.0)
@@ -94,8 +94,8 @@ GEM
     capybara-screenshot (1.0.9)
       capybara (>= 1.0, < 3)
       launchy
-    capybara-webkit (1.8.0)
-      capybara (>= 2.3.0, < 2.7.0)
+    capybara-webkit (1.11.1)
+      capybara (>= 2.3.0, < 2.8.0)
       json
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -185,8 +185,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -301,11 +299,10 @@ DEPENDENCIES
   capistrano (~> 3.1)
   capistrano-rails!
   capistrano-rvm
-  capybara (~> 2.4.1)
   capybara-screenshot
-  capybara-webkit (~> 1.8)
+  capybara-webkit (~> 1.11.1)
   carrierwave (~> 0.10.0)
-  database_cleaner (~> 1.3.0)
+  database_cleaner
   factory_girl_rails (~> 4.4.1)
   fae-rails!
   guard-rspec (~> 4.3.1)
@@ -313,10 +310,8 @@ DEPENDENCIES
   jquery-ui-rails (~> 4.2.1)
   mysql2
   pry
-  quiet_assets
   rails (~> 4.1.0)
   rails-perftest
-  remotipart (~> 1.3.1)
   rmagick (~> 2.13.3)
   rspec-rails (~> 3.0.2)
   ruby-prof
@@ -327,4 +322,4 @@ DEPENDENCIES
   yarjuf
 
 BUNDLED WITH
-   1.13.0
+   1.14.6
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
index 3d2b47bb7..ea8292362 100644
--- a/gemfiles/rails_4_2.gemfile
+++ b/gemfiles/rails_4_2.gemfile
@@ -12,24 +12,21 @@ gem "capistrano-rails", :git => "https://github.com/wearefine/rails"
 gem "capistrano-rvm"
 gem "mysql2"
 gem "rails", "~> 4.2.0"
-gem "remotipart", "~> 1.3.1"
 
 group :test, :development do
   gem "rspec-rails", "~> 3.0.2"
   gem "pry"
-  gem "quiet_assets"
 end
 
 group :test do
   gem "factory_girl_rails", "~> 4.4.1"
-  gem "capybara-webkit", "~> 1.8"
+  gem "capybara-webkit", "~> 1.11.1"
   gem "capybara-screenshot"
   gem "guard-rspec", "~> 4.3.1"
   gem "selenium-webdriver", "~> 2.42.0"
   gem "shoulda-matchers", :require => false
   gem "yarjuf"
-  gem "database_cleaner", "~> 1.3.0"
-  gem "capybara", "~> 2.4.1"
+  gem "database_cleaner"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4_2.gemfile.lock b/gemfiles/rails_4_2.gemfile.lock
index ae66182b5..24f28236a 100644
--- a/gemfiles/rails_4_2.gemfile.lock
+++ b/gemfiles/rails_4_2.gemfile.lock
@@ -7,7 +7,7 @@ GIT
       capistrano-bundler (~> 1.1)
 
 PATH
-  remote: ../
+  remote: ..
   specs:
     fae-rails (1.5.0)
       acts_as_list (~> 0.9.0)
@@ -103,8 +103,8 @@ GEM
     capybara-screenshot (1.0.9)
       capybara (>= 1.0, < 3)
       launchy
-    capybara-webkit (1.8.0)
-      capybara (>= 2.3.0, < 2.7.0)
+    capybara-webkit (1.11.1)
+      capybara (>= 2.3.0, < 2.8.0)
       json
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -199,8 +199,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -324,11 +322,10 @@ DEPENDENCIES
   capistrano (~> 3.1)
   capistrano-rails!
   capistrano-rvm
-  capybara (~> 2.4.1)
   capybara-screenshot
-  capybara-webkit (~> 1.8)
+  capybara-webkit (~> 1.11.1)
   carrierwave (~> 0.10.0)
-  database_cleaner (~> 1.3.0)
+  database_cleaner
   factory_girl_rails (~> 4.4.1)
   fae-rails!
   guard-rspec (~> 4.3.1)
@@ -336,10 +333,8 @@ DEPENDENCIES
   jquery-ui-rails (~> 4.2.1)
   mysql2
   pry
-  quiet_assets
   rails (~> 4.2.0)
   rails-perftest
-  remotipart (~> 1.3.1)
   rmagick (~> 2.13.3)
   rspec-rails (~> 3.0.2)
   ruby-prof
@@ -350,4 +345,4 @@ DEPENDENCIES
   yarjuf
 
 BUNDLED WITH
-   1.13.0
+   1.14.6
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile
index 87fea507a..0eabd4a58 100644
--- a/gemfiles/rails_5_0.gemfile
+++ b/gemfiles/rails_5_0.gemfile
@@ -12,7 +12,6 @@ gem "capistrano-rails", :git => "https://github.com/wearefine/rails"
 gem "capistrano-rvm"
 gem "mysql2"
 gem "rails", "~> 5.0"
-gem "remotipart", "~> 1.3.1"
 
 group :test, :development do
   gem "rspec-rails", "~> 3.0.2"
@@ -21,15 +20,14 @@ end
 
 group :test do
   gem "factory_girl_rails", "~> 4.4.1"
-  gem "capybara-webkit"
+  gem "capybara-webkit", "~> 1.11.1"
   gem "capybara-screenshot"
   gem "guard-rspec", "~> 4.3.1"
   gem "selenium-webdriver", "~> 2.42.0"
   gem "shoulda-matchers", :require => false
   gem "yarjuf"
-  gem "database_cleaner", "~> 1.5.0"
-  gem "rails-controller-testing"
-  gem "capybara", :github => "jnicklas/capybara"
+  gem "database_cleaner"
+  gem 'rails-controller-testing'
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock
index aa0ecef8b..b40a9f8db 100644
--- a/gemfiles/rails_5_0.gemfile.lock
+++ b/gemfiles/rails_5_0.gemfile.lock
@@ -1,15 +1,3 @@
-GIT
-  remote: git://github.com/jnicklas/capybara.git
-  revision: 2fece3ae24e33516d02ce91006335d009b082985
-  specs:
-    capybara (2.8.0.dev)
-      addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-
 GIT
   remote: https://github.com/wearefine/rails
   revision: 8250e29e4622ff60f8093dba92d52dbae9d26460
@@ -19,7 +7,7 @@ GIT
       capistrano-bundler (~> 1.1)
 
 PATH
-  remote: ../
+  remote: ..
   specs:
     fae-rails (1.5.0)
       acts_as_list (~> 0.9.0)
@@ -112,6 +100,13 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
+    capybara (2.7.1)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     capybara-screenshot (1.0.13)
       capybara (>= 1.0, < 3)
       launchy
@@ -228,10 +223,6 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.0)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (0.1.1)
-      actionpack (~> 5.x)
-      actionview (~> 5.x)
-      activesupport (~> 5.x)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
@@ -341,11 +332,10 @@ DEPENDENCIES
   capistrano (~> 3.1)
   capistrano-rails!
   capistrano-rvm
-  capybara!
   capybara-screenshot
-  capybara-webkit
+  capybara-webkit (~> 1.11.1)
   carrierwave (~> 0.10.0)
-  database_cleaner (~> 1.5.0)
+  database_cleaner
   factory_girl_rails (~> 4.4.1)
   fae-rails!
   guard-rspec (~> 4.3.1)
@@ -354,9 +344,7 @@ DEPENDENCIES
   mysql2
   pry
   rails (~> 5.0)
-  rails-controller-testing
   rails-perftest
-  remotipart (~> 1.3.1)
   rmagick (~> 2.13.3)
   rspec-rails (~> 3.0.2)
   ruby-prof
@@ -367,4 +355,4 @@ DEPENDENCIES
   yarjuf
 
 BUNDLED WITH
-   1.13.0
+   1.14.6
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7f0d1c277..2568a67bc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -62,15 +62,6 @@
   # Stop running tests on first caught fail, this is best used with config.order = "defined"
   # config.fail_fast = true
   # config.allow_url('gravatar.com')
-
-  # https://github.com/rails/rails-controller-testing#rspec
-  if Rails::VERSION::MAJOR > 4
-    [:controller, :view, :request].each do |type|
-      config.include ::Rails::Controller::Testing::TestProcess, :type => type
-      config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
-      config.include ::Rails::Controller::Testing::Integration, :type => type
-    end
-  end
 end
 
 Capybara::Webkit.configure do |config|
diff --git a/spec/support/devise_support.rb b/spec/support/devise_support.rb
index 0d4b798e2..1358e2ad5 100644
--- a/spec/support/devise_support.rb
+++ b/spec/support/devise_support.rb
@@ -58,8 +58,8 @@ def login(user)
 end
 
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.include SignInControllerHelper, type: :controller
   config.include SignInRequestHelper, type: :request
   config.include SignInFeatureHelper, type: :feature
-end
\ No newline at end of file
+end