3 files changed, 18 insertions, 10 deletions
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index de147a71c..fac3c7070 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip Test Suite</title>
 
-	<script src="../../../jquery-1.6.2.js"></script>
+	<script src="../../../jquery-1.7.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 82070fbfd..b5e8558e5 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -4,13 +4,19 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.tooltip.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
-	<script src="../../../ui/jquery.ui.tooltip.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.tooltip" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.tooltip.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
index 29220705f..99e1fbd79 100644
--- a/tests/unit/tooltip/tooltip_events.js
+++ b/tests/unit/tooltip/tooltip_events.js
@@ -52,14 +52,14 @@ test( "focus events", function() {
 	element.trigger( "blur" );
 });
 
-test( "mixed events", function() {
+asyncTest( "mixed events", function() {
 	expect( 2 );
 	var element = $( "#tooltipped1" ).tooltip();
 
 	element.one( "tooltipopen", function( event ) {
 		same( event.originalEvent.type, "focusin" );
 	});
-	element[0].focus();
+	element.simulate( "focus" );
 
 	element.one( "tooltipopen", function() {
 		ok( false, "open triggered while already open" );
@@ -72,10 +72,12 @@ test( "mixed events", function() {
 	element.trigger( "mouseleave" );
 	element.unbind( "tooltipclose" );
 
+	// blurring is async in IE
 	element.one( "tooltipclose", function( event ) {
 		same( event.originalEvent.type, "blur" );
+		start();
 	});
-	element[0].blur();
+	element.simulate( "blur" );
 });
 
 }( jQuery ) );