diff --git a/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb b/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb
index 9d5328d47262..d54b919a6832 100644
--- a/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb
+++ b/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb
@@ -261,6 +261,9 @@ def group_name(reference)
           root_seeder.seed_data!
         end
       end
+    ensure
+      reset(:seed_admin_user_enabled)
+      RequestStore.clear! # resets `User.current` cached result
     end
 
     it "creates the system user" do
diff --git a/spec/seeders/root_seeder_standard_edition_spec.rb b/spec/seeders/root_seeder_standard_edition_spec.rb
index ce2f6d450fcf..b34d5ed7c88e 100644
--- a/spec/seeders/root_seeder_standard_edition_spec.rb
+++ b/spec/seeders/root_seeder_standard_edition_spec.rb
@@ -298,6 +298,9 @@
           root_seeder.seed_data!
         end
       end
+    ensure
+      reset(:seed_admin_user_enabled)
+      RequestStore.clear! # resets `User.current` cached result
     end
 
     it "creates the system user" do