diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 9d9d859da1a..eebf640a868 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -178,10 +178,7 @@ QUnit.testDone(function() {
     }
   });
 
-  // attempts to remove any subscribed message bus callback
-  window.MessageBus.callbacks.forEach(function(callback) {
-    window.MessageBus.unsubscribe(callback.channel, callback.func);
-  });
+  window.MessageBus.unsubscribe("*");
 });
 
 // Load ES6 tests