diff --git a/Rakefile b/Rakefile
index f2c8a958..2640ab94 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,6 +6,6 @@ ENV['SKIP_SOLIDUS_BOLT'] = 'true'
 require 'bundler/gem_tasks'
 
 require 'solidus_dev_support/rake_tasks'
-SolidusDevSupport::RakeTasks.install
+SolidusDevSupport::RakeTasks.install(user_class: "Spree::User")
 
 task default: 'extension:specs'
diff --git a/lib/spree/auth/engine.rb b/lib/spree/auth/engine.rb
index d32f0035..f0e98489 100644
--- a/lib/spree/auth/engine.rb
+++ b/lib/spree/auth/engine.rb
@@ -13,16 +13,14 @@ class Engine < Rails::Engine
       isolate_namespace Spree
       engine_name 'solidus_auth'
 
+      Spree.user_class = "Spree::User"
+
       initializer "spree.auth.environment", before: :load_config_initializers do |_app|
         require 'spree/auth_configuration'
 
         Spree::Auth::Config = Spree::AuthConfiguration.new
       end
 
-      initializer "solidus_auth_devise.set_user_class", after: :load_config_initializers do
-        Spree.user_class = "Spree::User"
-      end
-
       config.to_prepare do
         Spree::Auth::Engine.prepare_backend if SolidusSupport.backend_available?
         Spree::Auth::Engine.prepare_frontend if SolidusSupport.frontend_available?
diff --git a/solidus_auth_devise.gemspec b/solidus_auth_devise.gemspec
index d8704049..17a4032a 100644
--- a/solidus_auth_devise.gemspec
+++ b/solidus_auth_devise.gemspec
@@ -36,6 +36,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'solidus_backend'
   spec.add_development_dependency 'solidus_frontend'
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.10'
   spec.add_development_dependency 'rails-controller-testing'
 end