diff --git a/.rubocop.yml b/.rubocop.yml
index a7714c1e7..7d025999a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -564,6 +564,9 @@ RSpec/LetBeforeExamples:
 RSpec/LetSetup:
   Enabled: true
 
+RSpec/MetadataStyle:
+  Enabled: true
+
 RSpec/NotToNot:
   Enabled: true
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ffe0e3cfc..a82d425e6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -63,7 +63,7 @@ RSpec.configure do |config|
     Capybara.default_set_options = { clear: :backspace }
   end
 
-  config.before(:each, type: :system, no_js: true) do
+  config.before(:each, :no_js, type: :system) do
     driven_by :rack_test
     Capybara.default_set_options = {}
   end