diff --git a/Gemfile b/Gemfile
index 17e0baf8dd..1438883b63 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,8 +54,7 @@ group :test do
   gem 'falcon'
   gem 'falcon-capybara'
 
-  # TODO: Use beta source for Rails 6 support
-  gem 'rspec-rails', '~> 4.0.0.beta3'
+  gem 'rspec-rails', '~> 6.0.0'
 end
 
 # Load local gems according to Refinery developer preference.
diff --git a/core/app/views/refinery/admin/_error_messages.html.erb b/core/app/views/refinery/admin/_error_messages.html.erb
index febb6a6dab..2e2fef12ed 100644
--- a/core/app/views/refinery/admin/_error_messages.html.erb
+++ b/core/app/views/refinery/admin/_error_messages.html.erb
@@ -7,8 +7,8 @@
       <li><%= value %></li>
     <% end %>
   <% else %>
-    <% object.errors.each do |key, value| %>
-      <li><%= value %></li>
+    <% object.errors.each do |error| %>
+      <li><%= error.message %></li>
     <% end %>
   <% end %>
   </ul>
diff --git a/core/lib/generators/refinery/cms/cms_generator.rb b/core/lib/generators/refinery/cms/cms_generator.rb
index b4a86e645d..c173cfbc62 100644
--- a/core/lib/generators/refinery/cms/cms_generator.rb
+++ b/core/lib/generators/refinery/cms/cms_generator.rb
@@ -19,13 +19,13 @@ class CmsGenerator < Rails::Generators::Base
                            :desc => "Skip over installing or running migrations."
 
     def generate
-      start_pretending?
+      saved_pretend = start_pretending?
 
       manage_roadblocks! unless self.options[:update]
 
       ensure_environments_are_sane!
 
-      stop_pretending?
+      stop_pretending? saved_pretend
 
       append_gemfile!
 
@@ -333,15 +333,16 @@ def start_pretending?
         new_options = self.options.dup
         new_options[:pretend] = true
         self.options = new_options
+        old_pretend
       end
     end
 
-    def stop_pretending?
+    def stop_pretending?(saved_pretend)
       # Stop pretending
       if destination_path == Refinery.root
         say_status :'-- finished pretending --', nil, :yellow
         new_options = self.options.dup
-        new_options[:pretend] = old_pretend
+        new_options[:pretend] = saved_pretend
         self.options = new_options
       end
     end
diff --git a/images/lib/refinery/images/validators/image_size_validator.rb b/images/lib/refinery/images/validators/image_size_validator.rb
index ecfdd589cc..1a02d70b25 100644
--- a/images/lib/refinery/images/validators/image_size_validator.rb
+++ b/images/lib/refinery/images/validators/image_size_validator.rb
@@ -7,9 +7,9 @@ def validate(record)
           image = record.image
 
           if image.respond_to?(:length) && image.length > Images.max_image_size
-            record.errors[:image] << ::I18n.t('too_big',
-                                             :scope => 'activerecord.errors.models.refinery/image',
-                                             :size => Images.max_image_size)
+            record.errors.add :too_big, ::I18n.t('too_big',
+                                       scope: 'activerecord.errors.models.refinery/image',
+                                       size: Images.max_image_size)
           end
         end
 
diff --git a/images/spec/models/refinery/image_spec.rb b/images/spec/models/refinery/image_spec.rb
index e10d4cb236..1d87e8f5a9 100644
--- a/images/spec/models/refinery/image_spec.rb
+++ b/images/spec/models/refinery/image_spec.rb
@@ -2,7 +2,7 @@
 require 'uri'
 
 module Refinery
-  describe Image, :type => :model do
+  describe Image, type: :model do
 
     let(:image)         { FactoryBot.build(:image) }
     let(:created_image) { FactoryBot.create(:image) }
@@ -37,7 +37,7 @@ module Refinery
         it "should contain an error message" do
           @image.valid?
           expect(@image.errors).not_to be_empty
-          expect(@image.errors[:image]).to eq(["Image should be smaller than #{Images.max_image_size} bytes in size"])
+          expect(@image.errors[:too_big]).to eq(["Image should be smaller than #{Images.max_image_size} bytes in size"])
         end
       end
 
diff --git a/images/spec/support/shared_examples/image_deleter.rb b/images/spec/support/shared_examples/image_deleter.rb
index a8ff8cf90b..4cfc097462 100644
--- a/images/spec/support/shared_examples/image_deleter.rb
+++ b/images/spec/support/shared_examples/image_deleter.rb
@@ -5,10 +5,8 @@
   end
 
   let(:image_count) {[Refinery::Image.count, Refinery::Images.pages_per_admin_index].min}
-  let(:deleting_an_image) {
-    -> {
-      first("#records li").click_link(::I18n.t('delete', scope: 'refinery.admin.images'))
-    }
+  let(:deleting_an_image)  {
+    first("#records li").click_link(::I18n.t('delete', scope: 'refinery.admin.images'))
   }
 
   it 'has a delete image link for each image' do
@@ -16,7 +14,7 @@
   end
 
   it "removes an image" do
-    expect(deleting_an_image).to change(Refinery::Image, :count).by(-1)
+    expect{ deleting_an_image }.to change(Refinery::Image, :count).by(-1)
   end
 
   it 'says the image has been removed' do
diff --git a/images/spec/support/shared_examples/image_uploader.rb b/images/spec/support/shared_examples/image_uploader.rb
index a55f6d4583..52915a8424 100644
--- a/images/spec/support/shared_examples/image_uploader.rb
+++ b/images/spec/support/shared_examples/image_uploader.rb
@@ -6,7 +6,6 @@
   end
 
   let(:uploading_an_image) {
-  ->{
     open_upload_dialog
     page.within_frame(dialog_frame_id) do
       select_upload
@@ -15,20 +14,19 @@
       fill_in  'image_image_alt', with: "Alt description for image"
       click_button ::I18n.t('save', scope: 'refinery.admin.form_actions')
     end
-    }
   }
 
   context 'when the image type is acceptable' do
     let(:image_path) {Refinery.roots('refinery/images').join("spec/fixtures/image-with-dashes.jpg")}
     it 'the image is uploaded', :js => true do
-      expect(uploading_an_image).to change(Refinery::Image, :count).by(1)
+      expect { uploading_an_image }.to change(Refinery::Image, :count).by(1)
     end
   end
 
   context 'when the image type is not acceptable' do
     let(:image_path) {Refinery.roots('refinery/images').join("spec/fixtures/cape-town-tide-table.pdf")}
     it 'the image is rejected', :js => true do
-      expect(uploading_an_image).to_not change(Refinery::Image, :count)
+      expect { uploading_an_image }.to_not change(Refinery::Image, :count)
       page.within_frame(dialog_frame_id) do
         expect(page).to have_content(::I18n.t('incorrect_format',
                                               :scope => 'activerecord.errors.models.refinery/image',
diff --git a/images/spec/support/spec_helper.rb b/images/spec/support/spec_helper.rb
index 6cd287bc09..872b3e7411 100644
--- a/images/spec/support/spec_helper.rb
+++ b/images/spec/support/spec_helper.rb
@@ -13,7 +13,3 @@ def has_image?(src)
 def ensure_on(path)
   visit(path) unless current_path == path
 end
-
-RSpec.configure do |c|
-  c.alias_it_should_behave_like_to :it_has_behaviour, 'has behaviour:'
-end
diff --git a/resources/lib/refinery/resources/validators/file_size_validator.rb b/resources/lib/refinery/resources/validators/file_size_validator.rb
index 9570c6253d..98f21649ae 100644
--- a/resources/lib/refinery/resources/validators/file_size_validator.rb
+++ b/resources/lib/refinery/resources/validators/file_size_validator.rb
@@ -7,9 +7,9 @@ def validate(record)
           file = record.file
 
           if file.respond_to?(:length) && file.length > Resources.max_file_size
-            record.errors[:file] << ::I18n.t('too_big',
-                                             :scope => 'activerecord.errors.models.refinery/resource',
-                                             :size => Resources.max_file_size)
+            record.errors.add  :too_big, ::I18n.t('too_big',
+                                        scope: 'activerecord.errors.models.refinery/resource',
+                                        size: Resources.max_file_size)
           end
         end
 
diff --git a/resources/spec/models/refinery/resource_spec.rb b/resources/spec/models/refinery/resource_spec.rb
index 2774c81709..4371f048a7 100644
--- a/resources/spec/models/refinery/resource_spec.rb
+++ b/resources/spec/models/refinery/resource_spec.rb
@@ -157,10 +157,10 @@ module Refinery
         it 'should contain an error message' do
           @resource.valid?
           expect(@resource.errors).not_to be_empty
-          expect(@resource.errors[:file]).to eq(Array(::I18n.t(
+          expect(@resource.errors[:too_big]).to eq([::I18n.t(
                                                         'too_big', scope: 'activerecord.errors.models.refinery/resource',
                                                                    size: Resources.max_file_size
-                                                      )))
+                                                      )])
         end
       end
 
diff --git a/resources/spec/system/refinery/admin/resources_spec.rb b/resources/spec/system/refinery/admin/resources_spec.rb
index 65bc50b01a..ccb3638637 100644
--- a/resources/spec/system/refinery/admin/resources_spec.rb
+++ b/resources/spec/system/refinery/admin/resources_spec.rb
@@ -22,16 +22,14 @@ module Admin
 
       context 'new/create' do
         let(:uploading_a_file) do
-          lambda do
-            visit refinery.admin_resources_path
-            find('a', text: 'Upload new file').click
+          visit refinery.admin_resources_path
+          find('a', text: 'Upload new file').click
 
-            expect(page).to have_selector 'iframe#dialog_iframe'
+          expect(page).to have_selector 'iframe#dialog_iframe'
 
-            page.within_frame('dialog_iframe') do
-              attach_file 'resource_file', file_path
-              click_button ::I18n.t('save', scope: 'refinery.admin.form_actions')
-            end
+          page.within_frame('dialog_iframe') do
+            attach_file 'resource_file', file_path
+            click_button ::I18n.t('save', scope: 'refinery.admin.form_actions')
           end
         end
 
@@ -39,7 +37,7 @@ module Admin
           let(:file_path) { Refinery.roots('refinery/resources').join('spec/fixtures/cape-town-tide-table.pdf') }
 
           it 'the file is uploaded', js: true do
-            expect(uploading_a_file).to change(Refinery::Resource, :count).by(1)
+            expect { uploading_a_file }.to change(Refinery::Resource, :count).by(1)
           end
         end
 
@@ -47,7 +45,7 @@ module Admin
           let(:file_path) { Refinery.roots('refinery/resources').join('spec/fixtures/refinery_is_secure.html') }
 
           it 'the file is rejected', js: true do
-            expect(uploading_a_file).to_not change(Refinery::Resource, :count)
+            expect { uploading_a_file }.to_not change(Refinery::Resource, :count)
 
             page.within_frame('dialog_iframe') do
               expect(page).to have_content(::I18n.t('incorrect_format', scope: 'activerecord.errors.models.refinery/resource'))
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ffb8cbb115..435d2141fc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -74,6 +74,12 @@
 
   # Store last errors so we can run rspec with --only-failures
   config.example_status_persistence_file_path = ".rspec_failures"
+
+  # it_has_behaviour alias is used in several gems.
+  config.alias_it_should_behave_like_to :it_has_behaviour, 'has behaviour:'
+
+  # for use when chasing deprecations
+  # config.raise_errors_for_deprecations!
 end
 
 # Requires supporting files with custom matchers and macros, etc,
diff --git a/testing/refinerycms-testing.gemspec b/testing/refinerycms-testing.gemspec
index 908cafcb7f..abc920decc 100644
--- a/testing/refinerycms-testing.gemspec
+++ b/testing/refinerycms-testing.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'factory_bot_rails',       '~> 4.8'
   s.add_dependency 'rails-controller-testing', '>= 0.1.1'
   s.add_dependency 'refinerycms-core', version
-  s.add_dependency 'rspec-rails', '~> 4.0.0.beta2'
+  s.add_dependency 'rspec-rails', '~> 6.0.0'
   s.add_dependency 'webdrivers', '~> 4.0'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version