diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 35660ee8c4..c23824b455 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -159,7 +159,6 @@ export function testCleanup(container, app) {
     });
   }
 
-  localStorage.clear();
   User.resetCurrent();
   resetExtraClasses();
   clearOutletCache();
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index a4a539d2c8..fa2a89cbef 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -319,6 +319,7 @@ export default function setupTests(config) {
     flushMap();
 
     MessageBus.unsubscribe("*");
+    localStorage.clear();
   });
 
   if (getUrlParameter("qunit_disable_auto_start") === "1") {