diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index 3d60ac0ebe7..7c40f5f89c2 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -13,12 +13,6 @@ acceptance("Composer Actions", {
   },
   site: {
     can_tag_topics: true
-  },
-  beforeEach() {
-    _clearSnapshots();
-  },
-  afterEach() {
-    _clearSnapshots();
   }
 });
 
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 3a92b2984ee..a93d9ada3d6 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -22,6 +22,7 @@ import { resetDecorators as resetPluginOutletDecorators } from "discourse/compon
 import { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector";
 import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
 import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
+import { _clearSnapshots } from "select-kit/components/composer-actions";
 import User from "discourse/models/user";
 
 export function currentUser() {
@@ -166,6 +167,7 @@ export function acceptance(name, options) {
       resetUsernameDecorators();
       resetOneboxCache();
       resetCustomPostMessageCallbacks();
+      _clearSnapshots();
       Discourse._runInitializer("instanceInitializers", function(
         initName,
         initializer