diff --git a/test/javascripts/helpers/qunit_helpers.js b/test/javascripts/helpers/qunit_helpers.js
index be6e42225..c1eb80f82 100644
--- a/test/javascripts/helpers/qunit_helpers.js
+++ b/test/javascripts/helpers/qunit_helpers.js
@@ -1,12 +1,20 @@
-function integration(name) {
+function integration(name, lifecycle) {
   module("Integration: " + name, {
     setup: function() {
       sinon.stub(Discourse.ScrollingDOMMethods, "bindOnScroll");
       sinon.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll");
       Ember.run(Discourse, Discourse.advanceReadiness);
+
+      if (lifecycle && lifecycle.setup) {
+        lifecycle.setup.call(this);
+      }
     },
 
     teardown: function() {
+      if (lifecycle && lifecycle.teardown) {
+        lifecycle.teardown.call(this);
+      }
+
       Discourse.reset();
       Discourse.ScrollingDOMMethods.bindOnScroll.restore();
       Discourse.ScrollingDOMMethods.unbindOnScroll.restore();