5 files changed, 12 insertions, 11 deletions
diff --git a/tests/unit/accordion/core.js b/tests/unit/accordion/core.js
index 0b334c00c..2829d3123 100644
--- a/tests/unit/accordion/core.js
+++ b/tests/unit/accordion/core.js
@@ -5,10 +5,10 @@ define( [
 	"ui/widgets/accordion"
 ], function( QUnit, $, testHelper ) {
 
-var setupTeardown = testHelper.setupTeardown,
+var beforeAfterEach = testHelper.beforeAfterEach,
 	state = testHelper.state;
 
-QUnit.module( "accordion: core", setupTeardown() );
+QUnit.module( "accordion: core", beforeAfterEach() );
 
 $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
 	QUnit.test( "markup structure: " + type, function( assert ) {
diff --git a/tests/unit/accordion/events.js b/tests/unit/accordion/events.js
index b9af7ce06..5b8525132 100644
--- a/tests/unit/accordion/events.js
+++ b/tests/unit/accordion/events.js
@@ -5,10 +5,10 @@ define( [
 	"ui/widgets/accordion"
 ], function( QUnit, $, testHelper ) {
 
-var setupTeardown = testHelper.setupTeardown,
+var beforeAfterEach = testHelper.beforeAfterEach,
 	state = testHelper.state;
 
-QUnit.module( "accordion: events", setupTeardown() );
+QUnit.module( "accordion: events", beforeAfterEach() );
 
 QUnit.test( "create", function( assert ) {
 	assert.expect( 10 );
diff --git a/tests/unit/accordion/helper.js b/tests/unit/accordion/helper.js
index 80bfc1854..3211765af 100644
--- a/tests/unit/accordion/helper.js
+++ b/tests/unit/accordion/helper.js
@@ -12,14 +12,15 @@ return $.extend( helper, {
 		} );
 	},
 
-	setupTeardown: function() {
+	beforeAfterEach: function() {
 		var animate = $.ui.accordion.prototype.options.animate;
 		return {
-			setup: function() {
+			beforeEach: function() {
 				$.ui.accordion.prototype.options.animate = false;
 			},
-			teardown: function() {
+			afterEach: function() {
 				$.ui.accordion.prototype.options.animate = animate;
+				return helper.moduleAfterEach.apply( this, arguments );
 			}
 		};
 	},
diff --git a/tests/unit/accordion/methods.js b/tests/unit/accordion/methods.js
index 1b11e91ee..622235785 100644
--- a/tests/unit/accordion/methods.js
+++ b/tests/unit/accordion/methods.js
@@ -6,10 +6,10 @@ define( [
 ], function( QUnit, $, testHelper ) {
 
 var equalHeight = testHelper.equalHeight,
-	setupTeardown = testHelper.setupTeardown,
+	beforeAfterEach = testHelper.beforeAfterEach,
 	state = testHelper.state;
 
-QUnit.module( "accordion: methods", setupTeardown() );
+QUnit.module( "accordion: methods", beforeAfterEach() );
 
 QUnit.test( "destroy", function( assert ) {
 	assert.expect( 1 );
diff --git a/tests/unit/accordion/options.js b/tests/unit/accordion/options.js
index 0fcaf5b78..ae53e5c45 100644
--- a/tests/unit/accordion/options.js
+++ b/tests/unit/accordion/options.js
@@ -6,10 +6,10 @@ define( [
 ], function( QUnit, $, testHelper ) {
 
 var equalHeight = testHelper.equalHeight,
-	setupTeardown = testHelper.setupTeardown,
+	beforeAfterEach = testHelper.beforeAfterEach,
 	state = testHelper.state;
 
-QUnit.module( "accordion: options", setupTeardown() );
+QUnit.module( "accordion: options", beforeAfterEach() );
 
 QUnit.test( "{ active: default }", function( assert ) {
 	assert.expect( 2 );