5 files changed, 24 insertions, 11 deletions
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 5ba5f046d..05b266438 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -16,19 +16,12 @@
 	<script type="text/javascript" src="../../jquery.simulate.js"></script>
 	<script type="text/javascript" src="../testsuite.js"></script>
 
-	<script>
-		test("datepicker", function() {
-			ok(false, "disabled for now to avoid crashing testswarm clients; enable for local testing only until performance issues are solved");
-		});
-	</script>
-	<!--
 	<script type="text/javascript" src="datepicker_core.js"></script>
 	<script type="text/javascript" src="datepicker_defaults.js"></script>
 	<script type="text/javascript" src="datepicker_events.js"></script>
 	<script type="text/javascript" src="datepicker_methods.js"></script>
 	<script type="text/javascript" src="datepicker_options.js"></script>
 	<script type="text/javascript" src="datepicker_tickets.js"></script>
-	-->
 </head>
 <body>
 
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 134480693..9ff25b3d6 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -40,7 +40,12 @@ var PROP_NAME = 'datepicker';
 
 (function($) {
 
-module("datepicker: core");
+module("datepicker: core", {
+	teardown: function() {
+		stop();
+		setTimeout(start, 13);
+	}
+});
 
 test('baseStructure', function() {
 	var inp = init('#inp');
diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js
index 84ca2f98e..0c207097a 100644
--- a/tests/unit/datepicker/datepicker_events.js
+++ b/tests/unit/datepicker/datepicker_events.js
@@ -3,7 +3,12 @@
  */
 (function($) {
 
-module("datepicker: events");
+module("datepicker: events", {
+	teardown: function() {
+		stop();
+		setTimeout(start, 13);
+	}
+});
 
 var selectedThis = null;
 var selectedDate = null;
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index 8d078f099..c102f7ac3 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -3,7 +3,12 @@
  */
 (function($) {
 
-module("datepicker: methods");
+module("datepicker: methods", {
+	teardown: function() {
+		stop();
+		setTimeout(start, 13);
+	}
+});
 
 test('destroy', function() {
 	var inp = init('#inp');
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index c3ffb1d11..b66644f0f 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -4,7 +4,12 @@
 
 (function($) {
 
-module("datepicker: options");
+module("datepicker: options", {
+	teardown: function() {
+		stop();
+		setTimeout(start, 13);
+	}
+});
 
 test('setDefaults', function() {
 	var inp = init('#inp');