diff --git a/tests/unit/listview/listview_core.js b/tests/unit/listview/listview_core.js
index 36c5289e..0a8808d3 100644
--- a/tests/unit/listview/listview_core.js
+++ b/tests/unit/listview/listview_core.js
@@ -13,9 +13,9 @@
 
 	asyncTest( "The page should enhanced correctly", function(){
 		setTimeout(function() {
-			ok($('#basic-linked-test [role="option"]').length == 3, "roles added to li elements");
+			ok($('#basic-linked-test .ui-li').length, ".ui-li classes added to li elements");
 			start();
-		}, 100);
+		}, 500);
 	});
 
 	asyncTest( "Slides to the listview page when the li a is clicked", function() {
@@ -48,7 +48,6 @@
 		$.testHelper.openPage("#nested-list-test");
 		setTimeout(function() {
 			ok($('#nested-list-test').hasClass('ui-page-active'), "makes nested list test page active");
-			ok($('[role="option"]', $('#nested-list-test')).length == 2, 'Adds data role to the two LIs');
 			ok($(':jqmData(url="nested-list-test&ui-page=More-animals-0")').length == 1, "Adds first UL to the page");
 			ok($(':jqmData(url="nested-list-test&ui-page=Groups-of-animals-1")').length == 1, "Adds second nested UL to the page");
 			start();
@@ -89,7 +88,6 @@
 		setTimeout(function() {
 			var $new_page = $('#numbered-list-test');
 			ok($new_page.hasClass('ui-page-active'), "Makes the new page active when the hash is changed.");
-			ok($('[role="option"]', $new_page).length == 3, "There should be three LI that are enhanced");
 			ok($('.ui-link-inherit', $new_page).first().text() == "Number 1", "The text of the first LI should be Number 1");
 			start();
 		}, 1000);
@@ -118,7 +116,6 @@
 		setTimeout(function() {
 			var $new_page = $('#read-only-list-test');
 			ok($new_page.hasClass('ui-page-active'), "makes the read only page the active page");
-			ok($('[role="option"]', $new_page).length === 4, "There are 4 li that enhanced as role options");
 			ok($('li', $new_page).first().text() === "Read", "The first LI has the proper text.");
 			start();
 		}, 1000);
@@ -139,7 +136,6 @@
 
 		setTimeout(function() {
 			var $new_page = $('#split-list-test');
-			ok($('[role="option"]', $new_page).length == 3);
 			ok($('.ui-li-link-alt', $new_page).length == 3);
 			ok($('.ui-link-inherit', $new_page).length == 3);
 			start();
@@ -150,7 +146,7 @@
 		$.testHelper.openPage("#split-list-test");
 
 		setTimeout(function(){
-			$('.ui-page-active [role="option"]:eq(0) a:eq(0)').click();
+			$('.ui-page-active .ui-li>a:eq(0) a:eq(0)').click();
 		}, 500);
 
 		setTimeout(function() {
@@ -164,7 +160,7 @@
 
 		$.testHelper.sequence([
 			function(){
-				$('.ui-page-active [role="option"]:eq(0)').click();
+				$('.ui-page-active .ui-listview a:eq(0)').click();
 			},
 
 			function(){