diff --git a/saas/config/environments/test.rb b/saas/config/environments/test.rb
deleted file mode 100644
index 3c425a8df..000000000
--- a/saas/config/environments/test.rb
+++ /dev/null
@@ -1 +0,0 @@
-require "fizzy/saas/testing"
diff --git a/saas/lib/fizzy/saas/engine.rb b/saas/lib/fizzy/saas/engine.rb
index ff175daac..cec30840d 100644
--- a/saas/lib/fizzy/saas/engine.rb
+++ b/saas/lib/fizzy/saas/engine.rb
@@ -38,6 +38,13 @@ module Fizzy
         end
       end
 
+      # Load test mocks automatically in test environment
+      initializer "fizzy_saas.test_mocks", after: :load_config_initializers do
+        if Rails.env.test?
+          require "fizzy/saas/testing"
+        end
+      end
+
       initializer "fizzy_saas.sentry" do
         if !Rails.env.local? && ENV["SKIP_TELEMETRY"].blank?
           Sentry.init do |config|