diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 18d0a2b0ea..9dfed888ab 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -221,18 +221,11 @@ Metrics/PerceivedComplexity:
     - 'app/models/spree/ability.rb'
     - 'app/models/spree/order/checkout.rb'
 
-# Offense count: 65
+# Offense count: 56
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
   Exclude:
-    - 'spec/controllers/spree/api_keys_controller_spec.rb'
-    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
-    - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/controllers/spree/user_sessions_controller_spec.rb'
-    - 'spec/controllers/spree/users_controller_spec.rb'
-    - 'spec/controllers/stripe/callbacks_controller_spec.rb'
-    - 'spec/controllers/stripe/webhooks_controller_spec.rb'
     - 'spec/helpers/admin/enterprises_helper_spec.rb'
     - 'spec/helpers/admin/orders_helper_spec.rb'
     - 'spec/helpers/admin/reports_helper_spec.rb'
diff --git a/spec/controllers/payment_gateways/paypal_controller_spec.rb b/spec/controllers/payment_gateways/paypal_controller_spec.rb
index 7bde1845cb..2dc54342bd 100644
--- a/spec/controllers/payment_gateways/paypal_controller_spec.rb
+++ b/spec/controllers/payment_gateways/paypal_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe PaymentGateways::PaypalController, type: :controller do
+RSpec.describe PaymentGateways::PaypalController do
   context '#cancel' do
     it 'redirects back to checkout' do
       expect(get(:cancel)).to redirect_to checkout_path
diff --git a/spec/controllers/payment_gateways/stripe_controller_spec.rb b/spec/controllers/payment_gateways/stripe_controller_spec.rb
index 28c2c0b595..1475503759 100644
--- a/spec/controllers/payment_gateways/stripe_controller_spec.rb
+++ b/spec/controllers/payment_gateways/stripe_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe PaymentGateways::StripeController, type: :controller do
+RSpec.describe PaymentGateways::StripeController do
   include StripeStubs
 
   let!(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
diff --git a/spec/controllers/spree/api_keys_controller_spec.rb b/spec/controllers/spree/api_keys_controller_spec.rb
index 5b3162acc0..87522e8546 100644
--- a/spec/controllers/spree/api_keys_controller_spec.rb
+++ b/spec/controllers/spree/api_keys_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Spree::ApiKeysController, type: :controller, performance: true do
+RSpec.describe Spree::ApiKeysController, performance: true do
   routes { Spree::Core::Engine.routes }
 
   include AuthenticationHelper
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index 184cfba059..6207eae50e 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Spree::CreditCardsController, type: :controller do
+RSpec.describe Spree::CreditCardsController do
   describe "using VCR", :vcr, :stripe_version do
     let(:user) { create(:user) }
 
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 685cf07268..95c56dc658 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Spree::OrdersController, type: :controller do
+RSpec.describe Spree::OrdersController do
   include CheckoutHelper
   include StripeStubs
 
diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb
index 5f03575263..cea3cc23e6 100644
--- a/spec/controllers/spree/user_sessions_controller_spec.rb
+++ b/spec/controllers/spree/user_sessions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Spree::UserSessionsController, type: :controller do
+RSpec.describe Spree::UserSessionsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb
index 6eff295eb6..2ff2d2aa42 100644
--- a/spec/controllers/spree/users_controller_spec.rb
+++ b/spec/controllers/spree/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Spree::UsersController, type: :controller do
+RSpec.describe Spree::UsersController do
   routes { Spree::Core::Engine.routes }
 
   include AuthenticationHelper
diff --git a/spec/controllers/stripe/callbacks_controller_spec.rb b/spec/controllers/stripe/callbacks_controller_spec.rb
index cb88f76256..4dc122a1a3 100644
--- a/spec/controllers/stripe/callbacks_controller_spec.rb
+++ b/spec/controllers/stripe/callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Stripe::CallbacksController, type: :controller do
+RSpec.describe Stripe::CallbacksController do
   let(:enterprise) { create(:distributor_enterprise) }
 
   context "#index" do
diff --git a/spec/controllers/stripe/webhooks_controller_spec.rb b/spec/controllers/stripe/webhooks_controller_spec.rb
index 0c54efb54e..ad289cb7a9 100644
--- a/spec/controllers/stripe/webhooks_controller_spec.rb
+++ b/spec/controllers/stripe/webhooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Stripe::WebhooksController, type: :controller do
+RSpec.describe Stripe::WebhooksController do
   describe "#create" do
     let(:params) do
       {