1 files changed, 27 insertions, 21 deletions

diff --git a/tests/unit/calendar/events.js b/tests/unit/calendar/events.js
index a8a0b38e0..37ad57a85 100644
--- a/tests/unit/calendar/events.js
+++ b/tests/unit/calendar/events.js
@@ -4,33 +4,39 @@ define( [
 	"ui/widgets/calendar"
 ], function( $, testHelper ) {
 
-module( "calendar: events" );
+module( "calendar: events", {
+	setup: function() {
+		this.element = $( "#calendar" ).calendar();
+	}
+} );
 
 asyncTest( "select", function() {
 	expect( 6 );
 
-	var message, eventType,
-		element = $( "#calendar" ).calendar( {
-			select: function( event ) {
-				ok( true, "select event fired " + message );
-				equal(
-					event.type,
-					"calendarselect",
-					"select event " + message
-				);
-				equal(
-					event.originalEvent.type,
-					eventType,
-					"select originalEvent " + message
-				);
-			}
-		} );
+	var that = this,
+		message, eventType;
+
+	this.element.calendar( {
+		select: function( event ) {
+			ok( true, "select event fired " + message );
+			equal(
+				event.type,
+				"calendarselect",
+				"select event " + message
+			);
+			equal(
+				event.originalEvent.type,
+				eventType,
+				"select originalEvent " + message
+			);
+		}
+	} );
 
 	function step1() {
 		setTimeout( function() {
 			eventType = "mousedown";
 			message = "on calendar button " + eventType;
-			element.find( "table button:eq(1)" ).simulate( eventType );
+			that.element.find( "table button:eq(1)" ).simulate( eventType );
 			step2();
 		}, 50 );
 	}
@@ -39,7 +45,7 @@ asyncTest( "select", function() {
 		setTimeout( function() {
 			eventType = "keydown";
 			message = "on calendar button " + eventType;
-			testHelper.focusGrid( element )
+			testHelper.focusGrid( that.element )
 				.simulate( eventType, { keyCode: $.ui.keyCode.END } )
 				.simulate( eventType, { keyCode: $.ui.keyCode.ENTER } );
 			step3();
@@ -49,8 +55,8 @@ asyncTest( "select", function() {
 	// This should not trigger another event
 	function step3() {
 		setTimeout( function() {
-			element.calendar( "disable" );
-			element.find( "table button:eq(10)" ).simulate( "mousedown" );
+			that.element.calendar( "disable" );
+			that.element.find( "table button:eq(10)" ).simulate( "mousedown" );
 			start();
 		}, 50 );
 	}