From 5fffe7b9f2b0b9297129b4b3a675531db8ce33ff Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Wed, 15 Apr 2015 21:03:45 +0300
Subject: [PATCH] Page: Implement classes option

Fixes gh-7707
Closes gh-8121
---
 build/tasks/options/jscs.js                   |   13 +
 css/structure/jquery.mobile.dialog.css        |   14 +-
 css/structure/jquery.mobile.forms.select.css  |    6 +-
 .../jquery.mobile.transition.flow.css         |    2 +-
 demos/pages-dialog/dialog-buttons.html        |    2 +-
 demos/pages-dialog/dialog-noclosebtn.html     |    2 +-
 demos/pages-dialog/dialog-rightclosebtn.html  |    2 +-
 demos/pages-dialog/dialog-success.html        |    2 +-
 demos/pages-dialog/index.php                  |    6 +-
 demos/pages-multi-page/index.html             |    2 +-
 demos/selectmenu-custom-filter/index.php      |    6 +-
 js/index.php                                  |    2 +-
 js/init.js                                    |    4 +
 js/jquery.mobile.js                           |    2 +-
 js/widgets/dialog.js                          |  187 --
 js/widgets/forms/select.custom.js             |   60 +-
 js/widgets/page.dialog.backcompat.js          |   58 +
 js/widgets/page.dialog.js                     |  188 +-
 js/widgets/page.js                            |   98 +-
 js/widgets/pagecontainer.js                   |  347 +--
 js/widgets/popup.js                           |    2 +-
 .../dialog-extension/backcompat-tests.html    |  148 ++
 .../dialog-extension/backcompat_core.js       |  123 ++
 .../dialog-extension/dialog_events.js         |  241 +-
 tests/integration/dialog-extension/index.html |   62 +-
 .../dialog-extension/no-hash-tests.html       |   19 +-
 tests/integration/dialog/dialog_events.js     |  219 +-
 tests/integration/dialog/index.html           |   36 +-
 tests/integration/dialog/no-hash-tests.html   |   19 +-
 tests/integration/navigation/index.html       |    6 +-
 .../integration/navigation/navigation_base.js |   43 +-
 .../integration/navigation/navigation_core.js | 1950 +++++++++--------
 .../navigation/prefetched-dialog.html         |    2 +-
 .../navigation/sequence/index.html            |   12 +-
 .../sequence/sequence-redirect.html           |   12 +-
 tests/integration/page/index.html             |   20 +-
 tests/integration/page/page_enhance_within.js |   44 +-
 tests/integration/page/page_theme.js          |   36 +
 tests/integration/page/page_title_entity.js   |   17 +-
 .../pagecontainer/page_event_sequence_core.js |   38 +-
 .../transition-choice-dialog-tests.html       |   12 +-
 tests/integration/popup/index.html            |    2 +-
 tests/integration/select/cached-tests.html    |   14 +-
 tests/integration/select/index.html           |   12 +-
 tests/integration/select/select_cached.js     |  217 +-
 tests/integration/select/select_core.js       |  525 +++--
 tests/jquery.testHelper.js                    |    6 +-
 tests/unit/dialog/dialog_count.js             |   10 -
 tests/unit/init/dialog-load-tests.html        |    6 +-
 tests/unit/init/index.html                    |   12 +-
 tests/unit/init/init_dialog.js                |   18 +-
 .../index.html => page/dialog-tests.html}     |   44 +-
 tests/unit/page/dialog_count.js               |   12 +
 .../unit/pagecontainer/pagecontainer_core.js  |   37 +-
 54 files changed, 2763 insertions(+), 2216 deletions(-)
 delete mode 100644 js/widgets/dialog.js
 create mode 100644 js/widgets/page.dialog.backcompat.js
 create mode 100644 tests/integration/dialog-extension/backcompat-tests.html
 create mode 100644 tests/integration/dialog-extension/backcompat_core.js
 create mode 100644 tests/integration/page/page_theme.js
 delete mode 100644 tests/unit/dialog/dialog_count.js
 rename tests/unit/{dialog/index.html => page/dialog-tests.html} (57%)
 create mode 100644 tests/unit/page/dialog_count.js

diff --git a/build/tasks/options/jscs.js b/build/tasks/options/jscs.js
index e73dbca2a51..f8f541a7dfb 100644
--- a/build/tasks/options/jscs.js
+++ b/build/tasks/options/jscs.js
@@ -13,6 +13,9 @@ module.exports = {
 			"js/widgets/forms/clearButton.js",
 			"js/widgets/forms/textinput.backcompat.js",
 			"js/widgets/forms/textinput.js",
+			"js/widgets/page.dialog.backcompat.js",
+			"js/widgets/page.dialog.js",
+			"js/widgets/page.js",
 			"js/widgets/accordion.js",
 			"js/widgets/widget.backcompat.js",
 			"js/widgets/widget.theme.js",
@@ -43,6 +46,16 @@ module.exports = {
 			// Tests
 			"tests/unit/textinput/settings.js",
 			"tests/unit/textinput/textinput_core.js",
+			"tests/integration/dialog/dialog_events.js",
+			"tests/integration/navigation/navigation_core.js",
+			"tests/integration/select/select_cached.js",
+			"tests/integration/select/select_core.js",
+			"tests/integration/page/page_enhance_within.js",
+			"tests/integration/page/page_theme.js",
+			"tests/integration/page/page_title_entity.js",
+			"tests/unit/dialog/dialog_count.js",
+			"tests/unit/init/init_dialog.js",
+			"tests/unit/pagecontainer/pagecontainer_core.js",
 			"tests/unit/degrade-inputs/degradeInputs.js",
 			"tests/unit/enhancer/enhancer.js",
 			"tests/integration/popup/popup_core.js",
diff --git a/css/structure/jquery.mobile.dialog.css b/css/structure/jquery.mobile.dialog.css
index 31c8ee784cf..ecaa2559823 100644
--- a/css/structure/jquery.mobile.dialog.css
+++ b/css/structure/jquery.mobile.dialog.css
@@ -1,7 +1,7 @@
-.ui-dialog {
+.ui-page-dialog {
 	 background: none !important; /* this is to ensure that dialog theming does not apply (by default at least) on the page div */
 }
-.ui-dialog-contain {
+.ui-page-dialog-contain {
 	width: 92.5%;
 	max-width: 500px;
 	margin: 10% auto 1em auto;
@@ -9,21 +9,21 @@
 	position: relative;
 	top: -1em;
 }
-.ui-dialog-contain > .ui-header,
-.ui-dialog-contain > .ui-content,
-.ui-dialog-contain > .ui-footer {
+.ui-page-dialog-contain > .ui-header,
+.ui-page-dialog-contain > .ui-content,
+.ui-page-dialog-contain > .ui-footer {
 	display: block;
 	position: relative;
 	width: auto;
 	margin: 0;
 }
-.ui-dialog-contain > .ui-header {
+.ui-page-dialog-contain > .ui-header {
 	overflow: hidden;
 	z-index: 10;
 	padding: 0;
 	border-top-width: 0;
 }
-.ui-dialog-contain > .ui-footer {
+.ui-page-dialog-contain > .ui-footer {
 	z-index: 10;
 	padding: 0 1em;
 	border-bottom-width: 0;
diff --git a/css/structure/jquery.mobile.forms.select.css b/css/structure/jquery.mobile.forms.select.css
index 5bab909fd7e..38633b8e9fa 100644
--- a/css/structure/jquery.mobile.forms.select.css
+++ b/css/structure/jquery.mobile.forms.select.css
@@ -82,7 +82,7 @@
 	min-width: 11em;
 }
 
-.ui-selectmenu .ui-dialog-contain {
+.ui-selectmenu .ui-page-dialog-contain {
 	overflow: hidden;
 }
 
@@ -91,7 +91,7 @@
 	padding: 0;
 	border-width: 0;
 }
-.ui-selectmenu.ui-dialog .ui-header {
+.ui-selectmenu.ui-page-dialog .ui-header {
 	z-index: 1;
 	position: relative;
 }
@@ -110,7 +110,7 @@
 .ui-selectmenu .ui-header .ui-title {
 	margin: 0 2.875em;
 }
-.ui-selectmenu.ui-dialog .ui-content {
+.ui-selectmenu.ui-page-dialog .ui-content {
 	overflow: visible;
 	z-index: 1;
 }
diff --git a/css/structure/jquery.mobile.transition.flow.css b/css/structure/jquery.mobile.transition.flow.css
index ae84ab3151c..553ad5b66f2 100644
--- a/css/structure/jquery.mobile.transition.flow.css
+++ b/css/structure/jquery.mobile.transition.flow.css
@@ -7,7 +7,7 @@
 	transform-origin: 50% 30%;
 	box-shadow: 0 0 20px rgba(0,0,0,.4);
 }
-.ui-dialog.flow {
+.ui-page-dialog.flow {
 	-webkit-transform-origin: none;
 	-webkit-box-shadow: none;
 	-moz-transform-origin: none;
diff --git a/demos/pages-dialog/dialog-buttons.html b/demos/pages-dialog/dialog-buttons.html
index 42cb1347a9a..2016a4b3cc8 100644
--- a/demos/pages-dialog/dialog-buttons.html
+++ b/demos/pages-dialog/dialog-buttons.html
@@ -11,7 +11,7 @@
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>
-		.ui-dialog.dialog-actionsheet .ui-dialog-contain {
+		.ui-page-dialog.dialog-actionsheet .ui-page-dialog-contain {
 			margin-top: 0;
 		}
 	</style>
diff --git a/demos/pages-dialog/dialog-noclosebtn.html b/demos/pages-dialog/dialog-noclosebtn.html
index 2364ada9b4f..0454905f671 100644
--- a/demos/pages-dialog/dialog-noclosebtn.html
+++ b/demos/pages-dialog/dialog-noclosebtn.html
@@ -13,7 +13,7 @@
 </head>
 <body>
 
-<div data-role="page" data-close-button="none" data-dialog="true">
+<div data-role="page" data-close-btn="none" data-dialog="true">
 		<div data-role="header">
 		<h1>Dialog</h1>
 		</div>
diff --git a/demos/pages-dialog/dialog-rightclosebtn.html b/demos/pages-dialog/dialog-rightclosebtn.html
index 297be5742ee..0b96c794f8b 100644
--- a/demos/pages-dialog/dialog-rightclosebtn.html
+++ b/demos/pages-dialog/dialog-rightclosebtn.html
@@ -13,7 +13,7 @@
 </head>
 <body>
 
-	<div data-role="page" data-close-button="right" data-dialog="true">
+	<div data-role="page" data-close-btn="right" data-dialog="true">
 		<div data-role="header">
 		<h1>Dialog</h1>
 		</div>
diff --git a/demos/pages-dialog/dialog-success.html b/demos/pages-dialog/dialog-success.html
index fab9f470f68..af3553f4d77 100644
--- a/demos/pages-dialog/dialog-success.html
+++ b/demos/pages-dialog/dialog-success.html
@@ -11,7 +11,7 @@
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>
-		.ui-dialog.dialog-actionsheet .ui-dialog-contain {
+		.ui-page-dialog.dialog-actionsheet .ui-page-dialog-contain {
 			margin-top: 0;
 		}
 	</style>
diff --git a/demos/pages-dialog/index.php b/demos/pages-dialog/index.php
index 182290dade4..40110fead63 100644
--- a/demos/pages-dialog/index.php
+++ b/demos/pages-dialog/index.php
@@ -12,7 +12,7 @@
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>
-		.ui-dialog.dialog-actionsheet .ui-dialog-contain {
+		.ui-page-dialog.dialog-actionsheet .ui-page-dialog-contain {
 			margin-top: 0;
 		}
 	</style>
@@ -87,14 +87,14 @@
 		<p>Dialogs appear to be floating above an overlay layer. This overlay adopts the swatch "a" content color by default, but the <code>data-overlay-theme</code> attribute can be added to the page wrapper to set the overlay to any swatch letter. Here is an example of a dialog with the overlay set to swatch "e":</p>
 				<a href="dialog-overlay.html" class="ui-shadow ui-button ui-corner-all ui-button-inline" data-transition="pop">Custom overlay swatch</a>
 
-		<p>Dialogs can also be used more like a control sheet to offer multiple buttons if you simply remove the top margin from the dialog's inner container element. For example, if your dialog page had a class of <code>my-dialog</code>, you could add this CSS to pin that dialog to the top: <code>.ui-dialog.my-dialog .ui-dialog-contain { margin-top: 0 }</code>, or you could just apply that style to all dialogs with <code>.ui-dialog .ui-dialog-contain { margin-top: 0 }</code>.</p>
+		<p>Dialogs can also be used more like a control sheet to offer multiple buttons if you simply remove the top margin from the dialog's inner container element. For example, if your dialog page had a class of <code>my-dialog</code>, you could add this CSS to pin that dialog to the top: <code>.ui-page-dialog.my-dialog .ui-page-dialog-contain { margin-top: 0 }</code>, or you could just apply that style to all dialogs with <code>.ui-page-dialog .ui-page-dialog-contain { margin-top: 0 }</code>.</p>
 						<a href="dialog-buttons.html" class="ui-shadow ui-button ui-corner-all ui-button-inline" data-transition="slidedown">Share photos...</a>
 
 		<h2>Dialog width and margins</h2>
 		<p>For the sake of readability, dialogs have a default <code>width</code> of 92.5% and a <code>max-width</code> of 500 pixels. There is also a 10% top <code>margin</code> to give dialogs larger top margin on larger screens, but collapse to a small margin on smartphones. The dialog's inner container is shifted towards the <code>top</code> with 15px to hide the corner styling if a dialog is used as a control sheet (see above). To override these styles, add the following CSS override rule to your stylesheet and tweak as needed:</p>
 
 <pre><code>
-.ui-dialog-contain {
+.ui-page-dialog-contain {
 	<strong>width: 92.5%;</strong>
 	<strong>max-width: 500px;</strong>
 	<strong>margin: 10% auto 15px auto;</strong>
diff --git a/demos/pages-multi-page/index.html b/demos/pages-multi-page/index.html
index 79bd483a1cb..a08fe77cc0f 100644
--- a/demos/pages-multi-page/index.html
+++ b/demos/pages-multi-page/index.html
@@ -71,7 +71,7 @@ <h1>Dialog</h1>
 	<div role="main" class="ui-content">
 		<h2>Popup</h2>
 		<p>I have an id of "popup" on my page container and only look like a dialog because the link to me had a <code>data-rel="dialog"</code> attribute which gives me this inset look and a <code>data-transition="pop"</code> attribute to change the transition to pop. Without this, I'd be styled as a normal page.</p>
-		<p><a href="#one" data-rel="back" class="ui-button ui-shadow ui-corner-all ui-button-inline">Back to page "one"</a><span class="ui-icon ui-icon-back"></span></p>
+		<p><a href="#one" data-rel="back" class="ui-button ui-shadow ui-corner-all ui-button-inline">Back to page "one" <span class="ui-icon ui-icon-back"></span></a></p>
 	</div><!-- /content -->
 
 	<div data-role="footer">
diff --git a/demos/selectmenu-custom-filter/index.php b/demos/selectmenu-custom-filter/index.php
index f899d883b59..2eb5134a4e1 100644
--- a/demos/selectmenu-custom-filter/index.php
+++ b/demos/selectmenu-custom-filter/index.php
@@ -115,10 +115,10 @@ function pageIsSelectmenuDialog( page ) {
 			margin-left: .5em;
 			margin-right: .5em;
 		}
-		.ui-selectmenu.ui-dialog .ui-content {
+		.ui-selectmenu.ui-page-dialog .ui-content {
 			padding-top: 0;
 		}
-		.ui-selectmenu.ui-dialog .ui-selectmenu-list {
+		.ui-selectmenu.ui-page-dialog .ui-selectmenu-list {
 			margin-top: 0;
 		}
 		.ui-selectmenu.ui-popup .ui-selectmenu-list li.ui-first-child .ui-button {
@@ -126,7 +126,7 @@ function pageIsSelectmenuDialog( page ) {
 			-webkit-border-radius: 0;
 			border-radius: 0;
 		}
-		.ui-selectmenu.ui-dialog .ui-header {
+		.ui-selectmenu.ui-page-dialog .ui-header {
 			border-bottom-width: 1px;
 		}
 	</style>
diff --git a/js/index.php b/js/index.php
index 9cb4862c4cc..1cfc4fad51e 100644
--- a/js/index.php
+++ b/js/index.php
@@ -27,6 +27,7 @@
 	'widgets/enhancer.widgetCrawler.js',
 	'widgets/page.js',
 	'widgets/page.dialog.js',
+	'widgets/page.dialog.backcompat.js',
 	'widgets/loader.js',
 	
 	'events/navigate.js',
@@ -51,7 +52,6 @@
 	'transitions/visuals/turn.js',
 	'../external/jquery-ui/accordion.js',
 	'widgets/accordion.js',
-	'widgets/dialog.js',
 	'widgets/collapsible.js',
 	'widgets/addFirstLastClasses.js',
 	'widgets/collapsibleSet.js',
diff --git a/js/init.js b/js/init.js
index 2bd1e60ae95..24c7bfbc7b1 100644
--- a/js/init.js
+++ b/js/init.js
@@ -22,6 +22,7 @@
 			"./helpers",
 			"./data",
 			"./support",
+			"./widgets/enhancer",
 			"./events/navigate",
 			"./navigation/path",
 			"./navigation/method",
@@ -95,6 +96,9 @@ $.extend( $.mobile, {
 		// define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback)
 		$.mobile.firstPage = $pages.first();
 
+		// Ensure the widget factory takes into account option values stored as data-attributes
+		$.enhance._installWidget();
+
 		// define page container
 		$.mobile.pageContainer = $.mobile.firstPage
 			.parent()
diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
index 2a0c059f9dd..79350a85c5a 100644
--- a/js/jquery.mobile.js
+++ b/js/jquery.mobile.js
@@ -26,7 +26,7 @@
 			"./navigation",
 			"./degradeInputs",
 			"./widgets/page.dialog",
-			"./widgets/dialog",
+			"./widgets/page.dialog.backcompat",
 			"./widgets/collapsible",
 			"./widgets/collapsibleSet",
 			"./grid",
diff --git a/js/widgets/dialog.js b/js/widgets/dialog.js
deleted file mode 100644
index e293ed28e62..00000000000
--- a/js/widgets/dialog.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/*!
- * jQuery Mobile Dialog @VERSION
- * http://jquerymobile.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Dialogs (deprecated)
-//>>group: Widgets
-//>>description: Displays a page as a modal dialog with inset appearance and overlay background
-//>>docs: http://api.jquerymobile.com/dialog/
-//>>css.structure: ../css/structure/jquery.mobile.dialog.css
-//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
-
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [
-			"jquery",
-			"../widget",
-			"./page",
-			"../navigation" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-} )( function( $ ) {
-
-return $.widget( "mobile.dialog", {
-	version: "@VERSION",
-
-	options: {
-
-		// Accepts left, right and none
-		closeBtn: "left",
-		closeBtnText: "Close",
-		overlayTheme: "a",
-		corners: true
-	},
-
-	// Override the theme set by the page plugin on pageshow
-	_handlePageBeforeShow: function() {
-		this._isCloseable = true;
-		if ( this.options.overlayTheme ) {
-			this.element.parent().pagecontainer( "option", "theme", this.options.overlayTheme );
-		}
-	},
-
-	_handlePageBeforeHide: function() {
-		this._isCloseable = false;
-	},
-
-	// click and submit events:
-	// - clicks and submits should use the closing transition that the dialog
-	//   opened with unless a data-transition is specified on the link/form
-	// - if the click was on the close button, or the link has a data-rel="back"
-	//   it'll go back in history naturally
-	_handleVClickSubmit: function( event ) {
-		var attrs,
-			$target = $( event.target ).closest( event.type === "vclick" ? "a" : "form" );
-
-		if ( $target.length && !$target.jqmData( "transition" ) ) {
-			attrs = {};
-			attrs[ "data-" + $.mobile.ns + "transition" ] =
-				( $.mobile.navigate.history.getActive() || {} )[ "transition" ] ||
-				$.mobile.defaultDialogTransition;
-			attrs[ "data-" + $.mobile.ns + "direction" ] = "reverse";
-			$target.attr( attrs );
-		}
-	},
-
-	_create: function() {
-		var elem = this.element,
-			opts = this.options;
-
-		// Class the markup for dialog styling and wrap interior
-		elem.addClass( "ui-dialog" )
-			.wrapInner( $( "<div/>", {
-
-				// ARIA role
-				"role": "dialog",
-				"class": "ui-dialog-contain ui-overlay-shadow" +
-					( !!opts.corners ? " ui-corner-all" : "" )
-			} ) );
-
-		$.extend( this, {
-			_isCloseable: false,
-			_inner: elem.children(),
-			_headerCloseButton: null
-		} );
-
-		this._on( elem, {
-			vclick: "_handleVClickSubmit",
-			submit: "_handleVClickSubmit",
-			pagebeforeshow: "_handlePageBeforeShow",
-			pagebeforehide: "_handlePageBeforeHide"
-		} );
-
-		this._setCloseBtn( opts.closeBtn );
-	},
-
-	_setOptions: function( options ) {
-		var closeButtonLocation, closeButtonText,
-			currentOpts = this.options;
-
-		if ( options.corners !== undefined ) {
-			this._inner.toggleClass( "ui-corner-all", !!options.corners );
-		}
-
-		if ( options.overlayTheme !== undefined ) {
-			if ( $.mobile.activePage[ 0 ] === this.element[ 0 ] ) {
-				currentOpts.overlayTheme = options.overlayTheme;
-				this._handlePageBeforeShow();
-			}
-		}
-
-		if ( options.closeBtnText !== undefined ) {
-			closeButtonLocation = currentOpts.closeBtn;
-			closeButtonText = options.closeBtnText;
-		}
-
-		if ( options.closeBtn !== undefined ) {
-			closeButtonLocation = options.closeBtn;
-		}
-
-		if ( closeButtonLocation ) {
-			this._setCloseBtn( closeButtonLocation, closeButtonText );
-		}
-
-		this._super( options );
-	},
-
-	_setCloseBtn: function( location, text ) {
-		var dst,
-			button = this._headerCloseButton;
-
-		// Sanitize value
-		location = "left" === location ? "left" : "right" === location ? "right" : "none";
-
-		if ( "none" === location ) {
-			if ( button ) {
-				button.remove();
-				button = null;
-			}
-		} else if ( button ) {
-			button.removeClass( "ui-button-left ui-button-right" ).addClass( "ui-button-" + location );
-			if ( text ) {
-				button.text( text );
-			}
-		} else {
-			dst = this._inner.find( ":jqmData(role='header')" ).first();
-			button = $( "<a></a>", {
-				"role": "button",
-				"href": "#",
-				"class": "ui-button ui-corner-all ui-icon-delete ui-button-icon-only ui-button-" + location
-			} )
-				.text( text || this.options.closeBtnText || "" )
-				.prependTo( dst );
-			this._on( button, { click: "close" } );
-		}
-
-		this._headerCloseButton = button;
-	},
-
-	// Close method goes back in history
-	close: function() {
-		var hist = $.mobile.navigate.history;
-
-		if ( this._isCloseable ) {
-			this._isCloseable = false;
-			// If the hash listening is enabled and there is at least one preceding history
-			// entry it's ok to go back. Initial pages with the dialog hash state are an example
-			// where the stack check is necessary
-			if ( $.mobile.hashListeningEnabled && hist.activeIndex > 0 ) {
-				$.mobile.back();
-			} else {
-				$.mobile.pageContainer.pagecontainer( "back" );
-			}
-		}
-	}
-} );
-
-} );
diff --git a/js/widgets/forms/select.custom.js b/js/widgets/forms/select.custom.js
index 885bd89fbc7..73e52d2d29a 100644
--- a/js/widgets/forms/select.custom.js
+++ b/js/widgets/forms/select.custom.js
@@ -23,10 +23,9 @@
 			"jquery",
 			"../../core",
 			"../../navigation",
-			"../dialog",
 			"./select",
 			"../listview",
-			"../page",
+			"../page.dialog.backcompat",
 			"../popup" ], factory );
 	} else {
 
@@ -41,7 +40,7 @@ var unfocusableItemSelector = ".ui-disabled,.ui-state-disabled,.ui-li-divider,.u
 			.not( unfocusableItemSelector )
 				.first();
 
-		// if there's a previous option, focus it
+		// If there's a previous option, focus it
 		if ( adjacent.length ) {
 			target
 				.blur()
@@ -57,8 +56,8 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 
 		this._origTabIndex = ( this.element.attr( "tabindex" ) === undefined ) ? false : this.element.attr( "tabindex" );
 
-		// Custom selects cannot exist inside popups, so revert the "nativeMenu"
-		// option to true if a parent is a popup
+		// Custom selects cannot exist inside popups, so revert the "nativeMenu" option to true if
+		// a parent is a popup
 		o.nativeMenu = o.nativeMenu || ( this.element.parents( ":jqmData(role='popup'),:mobile-popup" ).length > 0 );
 
 		return this._super();
@@ -107,16 +106,19 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 		var target = $( event.target ),
 			li = target.closest( "li" );
 
-		// switch logic based on which key was pressed
+		// Switch logic based on which key was pressed
 		switch ( event.keyCode ) {
-		// up or left arrow keys
+
+		// Up or left arrow keys
 		case 38:
 			goToAdjacentItem( li, target, "prev" );
 			return false;
-		// down or right arrow keys
+
+		// Down or right arrow keys
 		case 40:
 			goToAdjacentItem( li, target, "next" );
 			return false;
+
 		// If enter or space is pressed, trigger click
 		case 13:
 		case 32:
@@ -150,17 +152,16 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 		this._delayedTrigger();
 
 		// TODO centralize page removal binding / handling in the page plugin.
-		// Suggestion from @jblas to do refcounting
+		// Suggestion from @jblas to do refcounting.
 		//
 		// TODO extremely confusing dependency on the open method where the pagehide.remove
-		// bindings are stripped to prevent the parent page from disappearing. The way
-		// we're keeping pages in the DOM right now sucks
+		// bindings are stripped to prevent the parent page from disappearing. The way we're
+		// keeping pages in the DOM right now sucks
 		//
-		// rebind the page remove that was unbound in the open function
-		// to allow for the parent page removal from actions other than the use
-		// of a dialog sized custom select
+		// Rebind the page remove that was unbound in the open function to allow for the parent
+		// page removal from actions other than the use of a dialog sized custom select
 		//
-		// doing this here provides for the back button on the custom select dialog
+		// Doing this here provides for the back button on the custom select dialog
 		this.thisPage.page( "bindRemove" );
 	},
 
@@ -237,7 +238,7 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 			"<div data-" + $.mobile.ns + "role='header'>" +
 			"<div class='ui-title'></div>" +
 			"</div>" +
-			"<div data-" + $.mobile.ns + "role='content'></div>" +
+			"<div class='ui-content'></div>" +
 			"</div>" )
 			.attr( "id", dialogId );
 		listbox = $( "<div" + themeAttr + overlayThemeAttr +
@@ -301,8 +302,8 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 			"click li:not(.ui-disabled,.ui-state-disabled,.ui-li-divider)": "_handleListItemClick"
 		} );
 
-		// button refocus ensures proper height calculation
-		// by removing the inline style and ensuring page inclusion
+		// Button refocus ensures proper height calculation by removing the inline style and
+		// ensuring page inclusion
 		this._on( this.menuPage, { pagehide: "_handleMenuPageHide" } );
 
 		// Events on the popup
@@ -334,9 +335,8 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 		var list = this.list.find( "li" ),
 			options = this._selectOptions().not( ".ui-screen-hidden" );
 
-		// TODO exceedingly naive method to determine difference
-		// ignores value changes etc in favor of a forcedRebuild
-		// from the user in the refresh method
+		// TODO exceedingly naive method to determine difference ignores value changes etc in favor
+		// of a forcedRebuild from the user in the refresh method
 		return options.text() !== list.text();
 	},
 
@@ -395,14 +395,16 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 		var self = this;
 
 		if ( self.menuType === "page" ) {
-			self.menuPage.dialog( "close" );
+			if ( self.menuPage.hasClass( "ui-page-active" ) ) {
+				$.mobile.back();
+			}
 			self.list.appendTo( self.listbox );
 		} else {
 			self.listbox.popup( "close" );
 		}
 
 		self._focusButton();
-		// allow the dialog to be closed again
+		// Allow the dialog to be closed again
 		self.isOpen = false;
 	},
 
@@ -433,12 +435,11 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 			self.menuPageContent = self.menuPage.find( ".ui-content" );
 			self.menuPageClose = self.menuPage.find( ".ui-header a" );
 
-			// prevent the parent page from being removed from the DOM,
-			// otherwise the results of selecting a list item in the dialog
-			// fall into a black hole
+			// Prevent the parent page from being removed from the DOM, otherwise the results of
+			// selecting a list item in the dialog fall into a black hole
 			self.thisPage.unbind( "pagehide.remove" );
 
-			//for WebOS/Opera Mini (set lastscroll using button offset)
+			// For WebOS/Opera Mini (set lastscroll using button offset)
 			if ( scrollTop === 0 && buttonOffset > screenHeight ) {
 				self.thisPage.one( "pagehide", function() {
 					$( this ).jqmData( "lastScroll", buttonOffset );
@@ -526,9 +527,8 @@ return $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
 				needPlaceholder = false;
 				isPlaceholderItem = true;
 
-				// If we have identified a placeholder, record the fact that it was
-				// us who have added the placeholder to the option and mark it
-				// retroactively in the select as well
+				// If we have identified a placeholder, record the fact that it was us who have
+				// added the placeholder to the option. Mark it retroactively in the select.
 				if ( null === option.getAttribute( dataPlaceholderAttr ) ) {
 					this._removePlaceholderAttr = true;
 				}
diff --git a/js/widgets/page.dialog.backcompat.js b/js/widgets/page.dialog.backcompat.js
new file mode 100644
index 00000000000..389898d3327
--- /dev/null
+++ b/js/widgets/page.dialog.backcompat.js
@@ -0,0 +1,58 @@
+/*!
+ * jQuery Mobile Page Styled As Dialog Backcompat @VERSION
+ * http://jquerymobile.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Dialog styling backcompat
+//>>group: Widgets
+//>>description: Style options for page styled as dialog
+
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [
+			"jquery",
+			"./widget.backcompat",
+			"./page.dialog" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+
+if ( $.mobileBackcompat !== false ) {
+	$.widget( "mobile.page", $.mobile.page, {
+		options: {
+			corners: true
+		},
+
+		classProp: "ui-page-dialog-contain",
+
+		_create: function() {
+
+			// Support for deprecated dialog widget functionality
+			if ( $.mobile.getAttribute( this.element[ 0 ], "role" ) === "dialog" ||
+				this.options.role === "dialog" ) {
+
+				// The page container needs to distinguish a dialog widget from a page styled
+				// as a dialog. It does so by looking for the "mobile-dialog" data item on the
+				// page element. Since the dialog is no longer a widget, we need to provide a
+				// dummy hint
+				$.data( this.element[ 0 ], "mobile-dialog", true );
+				this.options.dialog = true;
+			}
+			this._super();
+		}
+	} );
+	$.widget( "mobile.page", $.mobile.page, $.mobile.widget.backcompat );
+}
+
+return $.mobile.page;
+
+} );
diff --git a/js/widgets/page.dialog.js b/js/widgets/page.dialog.js
index c85e07abc68..2e3369ddb53 100644
--- a/js/widgets/page.dialog.js
+++ b/js/widgets/page.dialog.js
@@ -33,115 +33,199 @@
 
 return $.widget( "mobile.page", $.mobile.page, {
 	options: {
+		classes: {
+			"ui-page-dialog-close-button":
+				"ui-button ui-corner-all ui-button-icon-only",
+			"ui-page-dialog-close-button-icon": "ui-icon-delete ui-icon",
+			"ui-page-dialog-contain": "ui-overlay-shadow ui-corner-all"
+		},
 
 		// Accepts left, right and none
 		closeBtn: "left",
 		closeBtnText: "Close",
 		overlayTheme: "a",
-		corners: true,
 		dialog: false
 	},
 
 	_create: function() {
-		this._super();
-		if ( this.options.dialog ) {
+		this.dialog = {};
+
+		return this._superApply( arguments );
+	},
 
-			$.extend( this, {
-				_inner: this.element.children(),
-				_headerCloseButton: null
-			} );
+	_establishStructure: function() {
+		var returnValue = this._superApply( arguments );
 
-			if ( !this.options.enhanced ) {
-				this._setCloseBtn( this.options.closeBtn );
+		if ( this.options.dialog ) {
+			if ( this.options.enhanced ) {
+				this.dialog.wrapper = this.element.children( ".ui-page-dialog-contain" ).eq( 0 );
+				if ( this.options.closeBtn !== "none" ) {
+					this.dialog.button = this.dialog.wrapper
+						.children( ".ui-header" )
+							.children( "a.ui-page-dialog-close-button" );
+					this.dialog.icon = this.dialog.button
+						.children( ".ui-page-dialog-close-button-icon" );
+				}
+			} else {
+				this.dialog.wrapper = $( "<div>" );
+
+				// Gut the page
+				this.dialog.wrapper.append( this.element.contents() );
+
+				// Establish the button
+				this._setCloseButton( this.options.closeBtn, this.options.closeBtnText );
 			}
 		}
+
+		return returnValue;
 	},
 
-	_enhance: function() {
-		this._super();
+	_setAttributes: function() {
+		var returnValue = this._superApply( arguments );
 
-		// Class the markup for dialog styling and wrap interior
 		if ( this.options.dialog ) {
-			this.element.addClass( "ui-dialog" )
-				.wrapInner( $( "<div/>", {
-
-					// ARIA role
-					"role": "dialog",
-					"class": "ui-dialog-contain ui-overlay-shadow" +
-						( this.options.corners ? " ui-corner-all" : "" )
-				} ) );
+			this._addClass( "ui-page-dialog", null );
+			this._addClass( this.dialog.wrapper, "ui-page-dialog-contain", null );
+
+			// Aria role
+			this.dialog.wrapper.attr( "role", "dialog" );
+		}
+
+		if ( this.dialog.button && this.options.enhanced ) {
+			this._toggleButtonClasses( true, this.options.closeBtn );
 		}
+
+		return returnValue;
+	},
+
+	_attachToDOM: function() {
+		var returnValue = this._superApply( arguments );
+
+		if ( this.options.dialog && !this.options.enhanced ) {
+			this.element.append( this.dialog.wrapper );
+		}
+
+		return returnValue;
+	},
+
+	_toggleButtonClasses: function( add, location ) {
+		this._toggleClass( this.dialog.button, "ui-page-dialog-close-button",
+			"ui-button-" + location, add );
+		this._toggleClass( this.dialog.icon, "ui-page-dialog-close-button-icon", null, add );
 	},
 
 	_setOptions: function( options ) {
-		var closeButtonLocation, closeButtonText,
-			currentOpts = this.options;
+		var closeButtonLocation, closeButtonText;
 
-		if ( options.corners !== undefined ) {
-			this._inner.toggleClass( "ui-corner-all", !!options.corners );
+		this._super( options );
+
+		if ( !this.options.dialog ) {
+			return;
 		}
 
 		if ( options.overlayTheme !== undefined ) {
 			if ( $.mobile.activePage[ 0 ] === this.element[ 0 ] ) {
-				currentOpts.overlayTheme = options.overlayTheme;
+
+				// Needs the option value to already be set on this.options. This is accomplished
+				// by chaining up above, before handling the overlayTheme change.
 				this._handlePageBeforeShow();
 			}
 		}
 
 		if ( options.closeBtnText !== undefined ) {
-			closeButtonLocation = currentOpts.closeBtn;
+			closeButtonLocation = this.options.closeBtn;
 			closeButtonText = options.closeBtnText;
 		}
 
 		if ( options.closeBtn !== undefined ) {
 			closeButtonLocation = options.closeBtn;
+			closeButtonText = closeButtonText || this.options.closeBtnText;
 		}
 
 		if ( closeButtonLocation ) {
-			this._setCloseBtn( closeButtonLocation, closeButtonText );
+			this._setCloseButton( closeButtonLocation, closeButtonText );
 		}
+	},
 
-		this._super( options );
+	_toggleCloseButtonClickability: function( isClickable ) {
+		if ( this.dialog.button ) {
+			if ( isClickable ) {
+				this.dialog.button.css( "pointer-events", "" );
+				this.dialog.button.removeAttr( "tabindex" );
+			} else {
+				this.dialog.button.css( "pointer-events", "none" );
+				this.dialog.button.attr( "tabindex", -1 );
+			}
+		}
 	},
 
 	_handlePageBeforeShow: function() {
+
+		// Make sure the close button is clickable
+		this._toggleCloseButtonClickability( true );
 		if ( this.options.overlayTheme && this.options.dialog ) {
-			this.removeContainerBackground();
-			this.setContainerBackground( this.options.overlayTheme );
+			this._setContainerSwatch( this.options.overlayTheme );
 		} else {
 			this._super();
 		}
 	},
 
-	_setCloseBtn: function( location, text ) {
-		var dst,
-			button = this._headerCloseButton;
+	_handleButtonClick: function() {
+
+		// Render the close button unclickable after one click
+		this._toggleCloseButtonClickability( false );
+	},
+
+	_setCloseButton: function( location, text ) {
+		var destination;
 
 		// Sanitize value
 		location = "left" === location ? "left" : "right" === location ? "right" : "none";
 
-		if ( "none" === location ) {
-			if ( button ) {
-				button.remove();
-				button = null;
+		if ( this.dialog.button ) {
+
+			if ( "none" === location ) {
+
+				// Remove existing button
+				this._toggleButtonClasses( false, location );
+				this._off( this.dialog.button, "click" );
+				this.dialog.button.remove();
+				this.dialog.button = null;
+				this.dialog.icon = null;
+			} else {
+
+				// Update existing button
+				this._removeClass( this.dialog.button, null, "ui-button-left ui-button-right" )
+					._addClass( this.dialog.button, null, "ui-button-" + location );
+				if ( text ) {
+
+					// Get rid of all text nodes without touching other node types before updating
+					// the button's text.
+					this.dialog.button.contents()
+						.filter( function() {
+							return ( this.nodeType === 3 );
+						} )
+						.remove();
+					this.dialog.button.prepend( text );
+				}
 			}
-		} else if ( button ) {
-			button.removeClass( "ui-button-left ui-button-right" ).addClass( "ui-button-" + location );
-			if ( text ) {
-				button.text( text );
+		} else if ( location !== "none" ) {
+
+			// Create new button
+			destination = this.dialog.wrapper
+				.children( ".ui-header,[data-" + $.mobile.ns + "role='header']" )
+					.first();
+			if ( destination.length ) {
+				this.dialog.button = $( "<a href='#' data-" + $.mobile.ns + "rel='back'></a>" )
+					.text( text || this.options.closeBtnText || "" );
+				this.dialog.icon = $( "<span>" ).appendTo( this.dialog.button );
+
+				this._toggleButtonClasses( true, location );
+
+				this.dialog.button.prependTo( destination );
+				this._on( this.dialog.button, { "click": "_handleButtonClick" } );
 			}
-		} else {
-			dst = this._inner.find( ":jqmData(role='header')" ).first();
-			button = $( "<a></a>", {
-				"href": "#",
-				"class": "ui-button ui-corner-all ui-icon-delete ui-button-icon-only ui-button-" + location
-			} )
-				.attr( "data-" + $.mobile.ns + "rel", "back" )
-				.text( text || this.options.closeBtnText || "" )
-				.prependTo( dst );
 		}
-
-		this._headerCloseButton = button;
 	}
 } );
 
diff --git a/js/widgets/page.js b/js/widgets/page.js
index 59c73bf6df0..9db572252f2 100644
--- a/js/widgets/page.js
+++ b/js/widgets/page.js
@@ -22,6 +22,7 @@
 		define( [
 			"jquery",
 			"../widget",
+			"./widget.theme",
 			"../core",
 			"widgets/enhancer",
 			"widgets/enhancer.backcompat",
@@ -40,83 +41,57 @@ $.widget( "mobile.page", {
 		theme: "a",
 		domCache: false,
 
-		// Deprecated in 1.4 remove in 1.5
-		keepNativeDefault: $.mobile.keepNative,
-
-		// Deprecated in 1.4 remove in 1.5
-		contentTheme: null,
 		enhanceWithin: true,
 		enhanced: false
 	},
 
-	// DEPRECATED for > 1.4
-	// TODO remove at 1.5
-	_createWidget: function() {
-		$.Widget.prototype._createWidget.apply( this, arguments );
-		this._trigger( "init" );
-	},
-
 	_create: function() {
+
 		// If false is returned by the callbacks do not create the page
 		if ( this._trigger( "beforecreate" ) === false ) {
 			return false;
 		}
 
-		if ( !this.options.enhanced ) {
-			this._enhance();
-		}
-
-		this._on( this.element, {
-			pagebeforehide: "removeContainerBackground",
-			pagebeforeshow: "_handlePageBeforeShow"
-		} );
+		this._establishStructure();
+		this._setAttributes();
+		this._attachToDOM();
+		this._addHandlers();
 
 		if ( this.options.enhanceWithin ) {
 			this.element.enhanceWithin();
 		}
-		// Dialog widget is deprecated in 1.4 remove this in 1.5
-		if ( $.mobile.getAttribute( this.element[ 0 ], "role" ) === "dialog" && $.mobile.dialog ) {
-			this.element.dialog();
-		}
 	},
 
-	_enhance: function() {
-		var attrPrefix = "data-" + $.mobile.ns,
-			self = this;
+	_establishStructure: $.noop,
 
+	_setAttributes: function() {
 		if ( this.options.role ) {
 			this.element.attr( "data-" + $.mobile.ns + "role", this.options.role );
 		}
+		this.element.attr( "tabindex", "0" );
+		this._addClass( "ui-page" );
+	},
 
-		this.element
-			.attr( "tabindex", "0" )
-			.addClass( "ui-page ui-page-theme-" + this.options.theme );
-
-		// Manipulation of content os Deprecated as of 1.4 remove in 1.5
-		this.element.find( "[" + attrPrefix + "role='content']" ).each( function() {
-			var $this = $( this ),
-				theme = this.getAttribute( attrPrefix + "theme" ) || undefined;
-			self.options.contentTheme = theme || self.options.contentTheme || ( self.options.dialog && self.options.theme ) || ( self.element.jqmData( "role" ) === "dialog" && self.options.theme );
-			$this.addClass( "ui-content" );
-			if ( self.options.contentTheme ) {
-				$this.addClass( "ui-body-" + ( self.options.contentTheme ) );
-			}
-			// Add ARIA role
-			$this.attr( "role", "main" ).addClass( "ui-content" );
+	_attachToDOM: $.noop,
+
+	_addHandlers: function() {
+		this._on( this.element, {
+			pagebeforehide: "_handlePageBeforeHide",
+			pagebeforeshow: "_handlePageBeforeShow"
 		} );
 	},
 
 	bindRemove: function( callback ) {
 		var page = this.element;
 
-		// when dom caching is not enabled or the page is embedded bind to remove the page on hide
+		// When dom caching is not enabled or the page is embedded bind to remove the page on hide
 		if ( !page.data( "mobile-page" ).options.domCache &&
 				page.is( ":jqmData(external-page='true')" ) ) {
 
 			// TODO use _on - that is, sort out why it doesn't work in this case
 			page.bind( "pagehide.remove", callback || function( e, data ) {
 
-					//check if this is a same page transition and if so don't remove the page
+					// Check if this is a same page transition and if so don't remove the page
 					if ( !data.samePage ) {
 						var $this = $( this ),
 							prEvent = new $.Event( "pageremove" );
@@ -131,31 +106,32 @@ $.widget( "mobile.page", {
 		}
 	},
 
-	_setOptions: function( o ) {
-		if ( o.theme !== undefined ) {
-			this.element.removeClass( "ui-page-theme-" + this.options.theme ).addClass( "ui-page-theme-" + o.theme );
-		}
-
-		if ( o.contentTheme !== undefined ) {
-			this.element.find( "[data-" + $.mobile.ns + "='content']" ).removeClass( "ui-body-" + this.options.contentTheme )
-				.addClass( "ui-body-" + o.contentTheme );
-		}
+	_themeElements: function() {
+		return [ {
+			element: this.element,
+			prefix: "ui-page-theme-"
+		} ];
 	},
 
 	_handlePageBeforeShow: function( /* e */ ) {
-		this.setContainerBackground();
+		this._setContainerSwatch( this.options.theme );
 	},
-	// Deprecated in 1.4 remove in 1.5
-	removeContainerBackground: function() {
-		this.element.closest( ":mobile-pagecontainer" ).pagecontainer( { "theme": "none" } );
+
+	_handlePageBeforeHide: function() {
+		this._setContainerSwatch( "none" );
 	},
-	// Deprecated in 1.4 remove in 1.5
-	// set the page container background to the page theme
-	setContainerBackground: function( theme ) {
-		this.element.parent().pagecontainer( { "theme": theme || this.options.theme } );
+
+	_setContainerSwatch: function( swatch ) {
+		var pagecontainer = this.element.parent().pagecontainer( "instance" );
+
+		if ( pagecontainer ) {
+			pagecontainer.option( "theme", swatch );
+		}
 	}
 } );
 
+$.widget( "mobile.page", $.mobile.page, $.mobile.widget.theme );
+
 return $.mobile.page;
 
 } );
diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js
index 90d75ce58ec..5e0716db1c1 100644
--- a/js/widgets/pagecontainer.js
+++ b/js/widgets/pagecontainer.js
@@ -53,14 +53,13 @@ $.widget( "mobile.pagecontainer", {
 		this.setLastScrollEnabled = true;
 
 		this._on( this.window, {
-			// disable an scroll setting when a hashchange has been fired,
-			// this only works because the recording of the scroll position
-			// is delayed for 100ms after the browser might have changed the
-			// position because of the hashchange
+
+			// Disable a scroll setting when a hashchange has been fired, this only works because
+			// the recording of the scroll position is delayed for 100ms after the browser might
+			// have changed the position because of the hashchange
 			navigate: "_disableRecordScroll",
 
-			// bind to scrollstop for the first page, "pagechange" won't be
-			// fired in that case
+			// Bind to scrollstop for the first page, "pagechange" won't be fired in that case
 			scrollstop: "_delayedRecordScroll"
 		} );
 
@@ -72,7 +71,7 @@ $.widget( "mobile.pagecontainer", {
 		// TODO move from page* events to content* events
 		this._on( { pagechange: "_afterContentChange" } );
 
-		// handle initial hashchange from chrome :(
+		// Handle initial hashchange from chrome :(
 		this.window.one( "navigate", $.proxy( function() {
 			this.setLastScrollEnabled = true;
 		}, this ) );
@@ -99,22 +98,23 @@ $.widget( "mobile.pagecontainer", {
 
 	// TODO consider the name here, since it's purpose specific
 	_afterContentChange: function() {
-		// once the page has changed, re-enable the scroll recording
+
+		// Once the page has changed, re-enable the scroll recording
 		this.setLastScrollEnabled = true;
 
-		// remove any binding that previously existed on the get scroll
-		// which may or may not be different than the scroll element
-		// determined for this page previously
+		// Remove any binding that previously existed on the get scroll which may or may not be
+		// different than the scroll element determined for this page previously
 		this._off( this.window, "scrollstop" );
 
-		// determine and bind to the current scoll element which may be the
-		// window or in the case of touch overflow the element touch overflow
+		// Determine and bind to the current scoll element which may be the window or in the case
+		// of touch overflow the element touch overflow
 		this._on( this.window, { scrollstop: "_delayedRecordScroll" } );
 	},
 
 	_recordScroll: function() {
-		// this barrier prevents setting the scroll value based on
-		// the browser scrolling the window based on a hashchange
+
+		// This barrier prevents setting the scroll value based on the browser scrolling the window
+		// based on a hashchange
 		if ( !this.setLastScrollEnabled ) {
 			return;
 		}
@@ -126,8 +126,8 @@ $.widget( "mobile.pagecontainer", {
 			currentScroll = this._getScroll();
 			defaultScroll = this._getDefaultScroll();
 
-			// Set active page's lastScroll prop. If the location we're
-			// scrolling to is less than minScrollBack, let it go.
+			// Set active page's lastScroll prop. If the location we're scrolling to is less than
+			// minScrollBack, let it go.
 			active.lastScroll = currentScroll < defaultScroll ? defaultScroll : currentScroll;
 		}
 	},
@@ -203,22 +203,22 @@ $.widget( "mobile.pagecontainer", {
 
 	go: function( steps ) {
 
-		//if hashlistening is enabled use native history method
+		// If hashlistening is enabled use native history method
 		if ( $.mobile.hashListeningEnabled ) {
 			window.history.go( steps );
 		} else {
 
-			//we are not listening to the hash so handle history internally
+			// We are not listening to the hash so handle history internally
 			var activeIndex = $.mobile.navigate.history.activeIndex,
 				index = activeIndex + parseInt( steps, 10 ),
 				url = $.mobile.navigate.history.stack[ index ].url,
 				direction = ( steps >= 1 ) ? "forward" : "back";
 
-			//update the history object
+			// Update the history object
 			$.mobile.navigate.history.activeIndex = index;
 			$.mobile.navigate.history.previousIndex = activeIndex;
 
-			//change to the new page
+			// Change to the new page
 			this.change( url, { direction: direction, changeHash: false, fromHashChange: true } );
 		}
 	},
@@ -227,7 +227,7 @@ $.widget( "mobile.pagecontainer", {
 	_handleDestination: function( to ) {
 		var history;
 
-		// clean the hash for comparison if it's a url
+		// Clean the hash for comparison if it's a url
 		if ( $.type( to ) === "string" ) {
 			to = $.mobile.path.stripHash( to );
 		}
@@ -279,15 +279,16 @@ $.widget( "mobile.pagecontainer", {
 				this.forward();
 			}
 
-			// prevent changePage call
+			// Prevent changePage call
 			return false;
 		} else {
-			// if the current active page is a dialog and we're navigating
+
+			// If the current active page is a dialog and we're navigating
 			// to a dialog use the dialog objected saved in the stack
 			to = data.pageUrl;
 			active = this._getActiveHistory();
 
-			// make sure to set the role, transition and reversal
+			// Make sure to set the role, transition and reversal
 			// as most of this is lost by the domCache cleaning
 			$.extend( changePageOptions, {
 				role: active.role,
@@ -301,19 +302,20 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_handleNavigate: function( url, data ) {
-		//find first page via hash
+
+		// Find first page via hash
 		// TODO stripping the hash twice with handleUrl
 		var to = $.mobile.path.stripHash( url ),
 			history = this._getHistory(),
 
-			// transition is false if it's the first page, undefined
-			// otherwise (and may be overridden by default)
+			// Transition is false if it's the first page, undefined otherwise (and may be
+			// overridden by default)
 			transition = history.stack.length === 0 ? "none" :
 				this._optionFromHistory( data.direction, "transition" ),
 
-			// default options for the changPage calls made after examining
-			// the current state of the page and the hash, NOTE that the
-			// transition is derived from the previous history entry
+			// Default options for the changPage calls made after examining the current state of
+			// the page and the hash, NOTE that the transition is derived from the previous history
+			// entry
 			changePageOptions = {
 				changeHash: false,
 				fromHashChange: true,
@@ -356,23 +358,26 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_enhance: function( content, role ) {
+
 		// TODO consider supporting a custom callback, and passing in
 		// the settings which includes the role
 		return content.page( { role: role } );
 	},
 
 	_include: function( page, settings ) {
-		// append to page and enhance
+
+		// Append to page and enhance
 		page.appendTo( this.element );
 
-		// use the page widget to enhance
+		// Use the page widget to enhance
 		this._enhance( page, settings.role );
 
-		// remove page on hide
+		// Remove page on hide
 		page.page( "bindRemove" );
 	},
 
 	_find: function( absUrl ) {
+
 		// TODO consider supporting a custom callback
 		var fileUrl = this._createFileUrl( absUrl ),
 			dataUrl = this._createDataUrl( absUrl ),
@@ -417,6 +422,7 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_showLoading: function( delay, theme, msg, textonly ) {
+
 		// This configurable timeout allows cached pages a brief
 		// delay to load without showing a message
 		if ( this._loadMsg ) {
@@ -430,6 +436,7 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_hideLoading: function() {
+
 		// Stop message show timer
 		clearTimeout( this._loadMsg );
 		this._loadMsg = 0;
@@ -439,28 +446,30 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_showError: function() {
-		// make sure to remove the current loading message
+
+		// Make sure to remove the current loading message
 		this._hideLoading();
 
-		// show the error message
+		// Show the error message
 		this._showLoading( 0, $.mobile.pageLoadErrorMessageTheme, $.mobile.pageLoadErrorMessage, true );
 
-		// hide the error message after a delay
+		// Hide the error message after a delay
 		// TODO configuration
 		setTimeout( $.proxy( this, "_hideLoading" ), 1500 );
 	},
 
 	_parse: function( html, fileUrl ) {
+
 		// TODO consider allowing customization of this method. It's very JQM specific
 		var page,
 			all = $( "<div></div>" );
 
-		//workaround to allow scripts to execute when included in page divs
+		// Workaround to allow scripts to execute when included in page divs
 		all.get( 0 ).innerHTML = html;
 
 		page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first();
 
-		//if page elem couldn't be found, create one and insert the body element's contents
+		// If page elem couldn't be found, create one and insert the body element's contents
 		if ( !page.length ) {
 			page = $( "<div data-" + this._getNs() + "role='page'>" +
 				( html.split( /<\/?body[^>]*>/gmi )[ 1 ] || "" ) +
@@ -477,7 +486,8 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_setLoadedTitle: function( page, html ) {
-		//page title regexp
+
+		// Page title regexp
 		var newPageTitle = html.match( /<title[^>]*>([^<]*)/ ) && RegExp.$1;
 
 		if ( newPageTitle && !page.jqmData( "title" ) ) {
@@ -499,10 +509,10 @@ $.widget( "mobile.pagecontainer", {
 			newEvent = $.Event( this.widgetName + name );
 
 		// DEPRECATED
-		// trigger the old deprecated event on the page if it's provided
+		// Trigger the old deprecated event on the page if it's provided
 		( page || this.element ).trigger( deprecatedEvent, data );
 
-		// use the widget trigger method for the new content* event
+		// Use the widget trigger method for the new content* event
 		this._trigger( name, newEvent, data );
 
 		return {
@@ -518,8 +528,8 @@ $.widget( "mobile.pagecontainer", {
 		var fileUrl = this._createFileUrl( absUrl );
 
 		return $.proxy( function( html, textStatus, xhr ) {
-			//pre-parse html to check for a data-url,
-			//use it as the new fileUrl, base path, etc
+
+			// Pre-parse html to check for a data-url, use it as the new fileUrl, base path, etc
 			var content,
 
 				// TODO handle dialogs again
@@ -527,9 +537,8 @@ $.widget( "mobile.pagecontainer", {
 
 				dataUrlRegex = new RegExp( "\\bdata-" + this._getNs() + "url=[\"']?([^\"'>]*)[\"']?" );
 
-			// data-url must be provided for the base tag so resource requests
-			// can be directed to the correct url. loading into a temprorary
-			// element makes these requests immediately
+			// data-url must be provided for the base tag so resource requests can be directed to
+			// the correct url. loading into a temprorary element makes these requests immediately
 			if ( pageElemRegex.test( html ) &&
 					RegExp.$1 &&
 					dataUrlRegex.test( RegExp.$1 ) &&
@@ -542,7 +551,7 @@ $.widget( "mobile.pagecontainer", {
 				fileUrl = this.window[ 0 ].encodeURIComponent( fileUrl );
 			}
 
-			//dont update the base tag if we are prefetching
+			// Don't update the base tag if we are prefetching
 			if ( settings.prefetch === undefined ) {
 				this._getBase().set( fileUrl );
 			}
@@ -601,6 +610,7 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	load: function( url, options ) {
+
 		// This function uses deferred notifications to let callers
 		// know when the content is done loading, or if an error has occurred.
 		var deferred = ( options && options.deferred ) || $.Deferred(),
@@ -636,20 +646,19 @@ $.widget( "mobile.pagecontainer", {
 		}
 
 		// The absolute version of the URL minus any dialog/subcontent params.
-		// In otherwords the real URL of the content to be loaded.
+		// In other words the real URL of the content to be loaded.
 		fileUrl = this._createFileUrl( absUrl );
 
-		// The version of the Url actually stored in the data-url attribute of
-		// the content. For embedded content, it is just the id of the page. For
-		// content within the same domain as the document base, it is the site
-		// relative path. For cross-domain content (Phone Gap only) the entire
-		// absolute Url is used to load the content.
+		// The version of the Url actually stored in the data-url attribute of the content. For
+		// embedded content, it is just the id of the page. For content within the same domain as
+		// the document base, it is the site relative path. For cross-domain content (PhoneGap
+		// only) the entire absolute Url is used to load the content.
 		dataUrl = this._createDataUrl( absUrl );
 
 		content = this._find( absUrl );
 
-		// If it isn't a reference to the first content and refers to missing
-		// embedded content reject the deferred and return
+		// If it isn't a reference to the first content and refers to missing embedded content
+		// reject the deferred and return
 		if ( content.length === 0 &&
 				$.mobile.path.isEmbeddedPage( fileUrl ) &&
 				!$.mobile.path.isFirstPageUrl( fileUrl ) ) {
@@ -661,16 +670,14 @@ $.widget( "mobile.pagecontainer", {
 		// TODO figure out why we doe this
 		this._getBase().reset();
 
-		// If the content we are interested in is already in the DOM,
-		// and the caller did not indicate that we should force a
-		// reload of the file, we are done. Resolve the deferrred so that
-		// users can bind to .done on the promise
+		// If the content we are interested in is already in the DOM, and the caller did not
+		// indicate that we should force a reload of the file, we are done. Resolve the deferrred
+		// so that users can bind to .done on the promise
 		if ( content.length && !settings.reload ) {
 			this._enhance( content, settings.role );
 			deferred.resolve( absUrl, settings, content );
 
-			//if we are reloading the content make sure we update
-			// the base if its not a prefetch
+			// If we are reloading the content make sure we update the base if its not a prefetch
 			if ( !settings.prefetch ) {
 				this._getBase().set( url );
 			}
@@ -701,8 +708,7 @@ $.widget( "mobile.pagecontainer", {
 			this._showLoading( settings.loadMsgDelay );
 		}
 
-		// Reset base to the default document base.
-		// only reset if we are not prefetching
+		// Reset base to the default document base. Only reset if we are not prefetching.
 		if ( settings.prefetch === undefined ) {
 			this._getBase().reset();
 		}
@@ -729,7 +735,8 @@ $.widget( "mobile.pagecontainer", {
 
 	_loadError: function( absUrl, triggerData, settings, deferred ) {
 		return $.proxy( function( xhr, textStatus, errorThrown ) {
-			//set base back to current path
+
+			// Set base back to current path
 			this._getBase().set( $.mobile.path.get() );
 
 			// Add error info to our triggerData.
@@ -765,9 +772,9 @@ $.widget( "mobile.pagecontainer", {
 	_getTransitionHandler: function( transition ) {
 		transition = $.mobile._maybeDegradeTransition( transition );
 
-		//find the transition handler for the specified transition. If there
-		//isn't one in our transitionHandlers dictionary, use the default one.
-		//call the handler immediately to kick-off the transition.
+		// Find the transition handler for the specified transition. If there isn't one in our
+		// transitionHandlers dictionary, use the default one. call the handler immediately to
+		// kick off the transition.
 		return $.mobile.transitionHandlers[ transition ] || $.mobile.defaultTransitionHandler;
 	},
 
@@ -780,12 +787,12 @@ $.widget( "mobile.pagecontainer", {
 		// TODO decide if these events should in fact be triggered on the container
 		if ( from ) {
 
-			//Check if this is a same page transition and tell the handler in page
+			// Check if this is a same page transition and tell the handler in page
 			if ( to[ 0 ] === from[ 0 ] ) {
 				samePage = true;
 			}
 
-			//trigger before show/hide events
+			// Trigger before show/hide events
 			// TODO deprecate nextPage in favor of next
 			this._triggerWithDeprecated( prefix + "hide", {
 
@@ -832,7 +839,8 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_releaseTransitionLock: function() {
-		//release transition lock so navigation is free again
+
+		// Release transition lock so navigation is free again
 		isPageTransitioning = false;
 		if ( pageTransitionQueue.length > 0 ) {
 			$.mobile.changePage.apply( null, pageTransitionQueue.pop() );
@@ -840,16 +848,17 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	_removeActiveLinkClass: function( force ) {
-		//clear out the active button state
+
+		// Clear out the active button state
 		$.mobile.removeActiveLinkClass( force );
 	},
 
 	_loadUrl: function( to, triggerData, settings ) {
-		// preserve the original target as the dataUrl value will be
-		// simplified eg, removing ui-state, and removing query params
-		// from the hash this is so that users who want to use query
-		// params have access to them in the event bindings for the page
-		// life cycle See issue #5085
+
+		// Preserve the original target as the dataUrl value will be simplified eg, removing
+		// ui-state, and removing query params from the hash this is so that users who want to use
+		// query params have access to them in the event bindings for the page life cycle
+		// See issue #5085
 		settings.target = to;
 		settings.deferred = $.Deferred();
 
@@ -858,8 +867,8 @@ $.widget( "mobile.pagecontainer", {
 		settings.deferred.done( $.proxy( function( url, options, content ) {
 			isPageTransitioning = false;
 
-			// store the original absolute url so that it can be provided
-			// to events in the triggerData of the subsequent changePage call
+			// Store the original absolute url so that it can be provided to events in the
+			// triggerData of the subsequent changePage call
 			options.absUrl = triggerData.absUrl;
 
 			this.transition( content, triggerData, options );
@@ -881,17 +890,18 @@ $.widget( "mobile.pagecontainer", {
 			options: settings
 		} );
 
-		// NOTE: preserve the original target as the dataUrl value will be
-		// simplified eg, removing ui-state, and removing query params from
-		// the hash this is so that users who want to use query params have
-		// access to them in the event bindings for the page life cycle
+		// NOTE: preserve the original target as the dataUrl value will be simplified eg, removing
+		// ui-state, and removing query params from the hash this is so that users who want to use
+		// query params have access to them in the event bindings for the page life cycle
 		// See issue #5085
 		if ( $.type( to ) === "string" ) {
-			// if the toPage is a string simply convert it
+
+			// If the toPage is a string simply convert it
 			triggerData.absUrl = $.mobile.path.makeUrlAbsolute( to, this._findBaseWithDefault() );
 		} else {
-			// if the toPage is a jQuery object grab the absolute url stored
-			// in the loadPage callback where it exists
+
+			// If the toPage is a jQuery object grab the absolute url stored in the loadPage
+			// callback where it exists
 			triggerData.absUrl = settings.absUrl;
 		}
 
@@ -908,9 +918,9 @@ $.widget( "mobile.pagecontainer", {
 	},
 
 	change: function( to, options ) {
-		// If we are in the midst of a transition, queue the current request.
-		// We'll call changePage() once we're done with the current transition
-		// to service the request.
+
+		// If we are in the midst of a transition, queue the current request. We'll call
+		// changePage() once we're done with the current transition to service the request.
 		if ( isPageTransitioning ) {
 			pageTransitionQueue.unshift( arguments );
 			return;
@@ -922,25 +932,23 @@ $.widget( "mobile.pagecontainer", {
 		// Make sure we have a fromPage.
 		settings.fromPage = settings.fromPage || this.activePage;
 
-		// if the page beforechange default is prevented return early
+		// If the page beforechange default is prevented return early
 		if ( !this._triggerPageBeforeChange( to, triggerData, settings ) ) {
 			return;
 		}
 
-		// We allow "pagebeforechange" observers to modify the to in
-		// the trigger data to allow for redirects. Make sure our to is
-		// updated. We also need to re-evaluate whether it is a string,
-		// because an object can also be replaced by a string
+		// We allow "pagebeforechange" observers to modify the to in the trigger data to allow for
+		// redirects. Make sure our to is updated. We also need to re-evaluate whether it is a
+		// string, because an object can also be replaced by a string
 		to = triggerData.toPage;
 
-		// If the caller passed us a url, call loadPage()
-		// to make sure it is loaded into the DOM. We'll listen
-		// to the promise object it returns so we know when
-		// it is done loading or if an error occurred.
+		// If the caller passed us a url, call loadPage() to make sure it is loaded into the DOM.
+		// We'll listen to the promise object it returns so we know when it is done loading or if
+		// an error ocurred.
 		if ( $.type( to ) === "string" ) {
-			// Set the isPageTransitioning flag to prevent any requests from
-			// entering this method while we are in the midst of loading a page
-			// or transitioning.
+
+			// Set the isPageTransitioning flag to prevent any requests from entering this method
+			// while we are in the midst of loading a page or transitioning.
 			isPageTransitioning = true;
 
 			this._loadUrl( to, triggerData, settings );
@@ -953,52 +961,52 @@ $.widget( "mobile.pagecontainer", {
 		var fromPage, url, pageUrl, fileUrl, active, activeIsInitialPage, historyDir, pageTitle,
 			isDialog, alreadyThere, newPageTitle, params, cssTransitionDeferred, beforeTransition;
 
-		// If we are in the midst of a transition, queue the current request.
-		// We'll call changePage() once we're done with the current transition
-		// to service the request.
+		// If we are in the midst of a transition, queue the current request. We'll call
+		// changePage() once we're done with the current transition to service the request.
 		if ( isPageTransitioning ) {
-			// make sure to only queue the to and settings values so the arguments
-			// work with a call to the change method
+
+			// Make sure to only queue the to and settings values so the arguments work with a call
+			// to the change method
 			pageTransitionQueue.unshift( [ toPage, settings ] );
 			return;
 		}
 
-		// DEPRECATED - this call only, in favor of the before transition
-		// if the page beforechange default is prevented return early
+		// DEPRECATED - this call only, in favor of the before transition if the page beforechange
+		// default is prevented return early
 		if ( !this._triggerPageBeforeChange( toPage, triggerData, settings ) ) {
 			return;
 		}
 
 		triggerData.prevPage = settings.fromPage;
-		// if the (content|page)beforetransition default is prevented return early
-		// Note, we have to check for both the deprecated and new events
+
+		// If the (content|page)beforetransition default is prevented return early. Note, we have
+		// to check for both the deprecated and new events
 		beforeTransition = this._triggerWithDeprecated( "beforetransition", triggerData );
 		if ( beforeTransition.deprecatedEvent.isDefaultPrevented() ||
 				beforeTransition.event.isDefaultPrevented() ) {
 			return;
 		}
 
-		// Set the isPageTransitioning flag to prevent any requests from
-		// entering this method while we are in the midst of loading a page
-		// or transitioning.
+		// Set the isPageTransitioning flag to prevent any requests from entering this method while
+		// we are in the midst of loading a page or transitioning.
 		isPageTransitioning = true;
 
-		// If we are going to the first-page of the application, we need to make
-		// sure settings.dataUrl is set to the application document url. This allows
-		// us to avoid generating a document url with an id hash in the case where the
-		// first-page of the document has an id attribute specified.
+		// If we are going to the first-page of the application, we need to make sure
+		// settings.dataUrl is set to the application document url. This allows us to avoid
+		// generating a document url with an id hash in the case where the first-page of the
+		// document has an id attribute specified.
 		if ( toPage[ 0 ] === $.mobile.firstPage[ 0 ] && !settings.dataUrl ) {
 			settings.dataUrl = $.mobile.path.documentUrl.hrefNoHash;
 		}
 
-		// The caller passed us a real page DOM element. Update our
-		// internal state and then trigger a transition to the page.
+		// The caller passed us a real page DOM element. Update our internal state and then trigger
+		// a transition to the page.
 		fromPage = settings.fromPage;
 		url = ( settings.dataUrl && $.mobile.path.convertUrlToDataUrl( settings.dataUrl ) ) ||
 			toPage.jqmData( "url" );
 
-		// The pageUrl var is usually the same as url, except when url is obscured
-		// as a dialog url. pageUrl always contains the file path
+		// The pageUrl var is usually the same as url, except when url is obscured as a dialog url.
+		// pageUrl always contains the file path
 		pageUrl = url;
 		fileUrl = $.mobile.path.getFilePath( url );
 		active = $.mobile.navigate.history.getActive();
@@ -1009,16 +1017,14 @@ $.widget( "mobile.pagecontainer", {
 			toPage.jqmData( "role" ) === "dialog" ) &&
 			toPage.jqmData( "dialog" ) !== true;
 
-		// By default, we prevent changePage requests when the fromPage and toPage
-		// are the same element, but folks that generate content
-		// manually/dynamically and reuse pages want to be able to transition to
-		// the same page. To allow this, they will need to change the default
-		// value of allowSamePageTransition to true, *OR*, pass it in as an
-		// option when they manually call changePage(). It should be noted that
-		// our default transition animations assume that the formPage and toPage
-		// are different elements, so they may behave unexpectedly. It is up to
-		// the developer that turns on the allowSamePageTransitiona option to
-		// either turn off transition animations, or make sure that an appropriate
+		// By default, we prevent changePage requests when the fromPage and toPage are the same
+		// element, but folks that generate content manually/dynamically and reuse pages want to be
+		// able to transition to the same page. To allow this, they will need to change the default
+		// value of allowSamePageTransition to true, *OR*, pass it in as an option when they
+		// manually call changePage(). It should be noted that our default transition animations
+		// assume that the formPage and toPage are different elements, so they may behave
+		// unexpectedly. It is up to the developer that turns on the allowSamePageTransitiona
+		// option to either turn off transition animations, or make sure that an appropriate
 		// animation transition is used.
 		if ( fromPage && fromPage[ 0 ] === toPage[ 0 ] &&
 				!settings.allowSamePageTransition ) {
@@ -1027,8 +1033,8 @@ $.widget( "mobile.pagecontainer", {
 			this._triggerWithDeprecated( "transition", triggerData );
 			this._triggerWithDeprecated( "change", triggerData );
 
-			// Even if there is no page change to be done, we should keep the
-			// urlHistory in sync with the hash changes
+			// Even if there is no page change to be done, we should keep the urlHistory in sync
+			// with the hash changes
 			if ( settings.fromHashChange ) {
 				$.mobile.navigate.history.direct( { url: url } );
 			}
@@ -1039,10 +1045,9 @@ $.widget( "mobile.pagecontainer", {
 		// We need to make sure the page we are given has already been enhanced.
 		toPage.page( { role: settings.role } );
 
-		// If the changePage request was sent from a hashChange event, check to
-		// see if the page is already within the urlHistory stack. If so, we'll
-		// assume the user hit the forward/back button and will try to match the
-		// transition accordingly.
+		// If the changePage request was sent from a hashChange event, check to see if the page is
+		// already within the urlHistory stack. If so, we'll assume the user hit the forward/back
+		// button and will try to match the transition accordingly.
 		if ( settings.fromHashChange ) {
 			historyDir = settings.direction === "back" ? -1 : 1;
 		}
@@ -1050,40 +1055,39 @@ $.widget( "mobile.pagecontainer", {
 		// We blur the focused element to cause the virtual keyboard to disappear
 		$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
 
-		// Record whether we are at a place in history where a dialog used to be -
-		// if so, do not add a new history entry and do not change the hash either
+		// Record whether we are at a place in history where a dialog used to be - if so, do not
+		// add a new history entry and do not change the hash either
 		alreadyThere = false;
 
-		// If we're displaying the page as a dialog, we don't want the url
-		// for the dialog content to be used in the hash. Instead, we want
-		// to append the dialogHashKey to the url of the current page.
+		// If we're displaying the page as a dialog, we don't want the url for the dialog content
+		// to be used in the hash. Instead, we want to append the dialogHashKey to the url of the
+		// current page.
 		if ( isDialog && active ) {
-			// on the initial page load active.url is undefined and in that case
-			// should be an empty string. Moving the undefined -> empty string back
-			// into urlHistory.addNew seemed imprudent given undefined better
-			// represents the url state
-
-			// If we are at a place in history that once belonged to a dialog, reuse
-			// this state without adding to urlHistory and without modifying the
-			// hash. However, if a dialog is already displayed at this point, and
-			// we're about to display another dialog, then we must add another hash
-			// and history entry on top so that one may navigate back to the
-			// original dialog
+
+			// On the initial page load active.url is undefined and in that case should be an empty
+			// string. Moving the undefined -> empty string back into urlHistory.addNew seemed
+			// imprudent given undefined better represents the url state
+
+			// If we are at a place in history that once belonged to a dialog, reuse this state
+			// without adding to urlHistory and without modifying the hash. However, if a dialog is
+			// already displayed at this point, and we're about to display another dialog, then we
+			// must add another hash and history entry on top so that one may navigate back to the
+			// original dialog.
 			if ( active.url &&
 					active.url.indexOf( $.mobile.dialogHashKey ) > -1 &&
 					this.activePage &&
-					!this.activePage.hasClass( "ui-dialog" ) &&
+					!this.activePage.hasClass( "ui-page-dialog" ) &&
 					$.mobile.navigate.history.activeIndex > 0 ) {
 
 				settings.changeHash = false;
 				alreadyThere = true;
 			}
 
-			// Normally, we tack on a dialog hash key, but if this is the location
-			// of a stale dialog, we reuse the URL from the entry
+			// Normally, we tack on a dialog hash key, but if this is the location of a stale
+			// dialog, we reuse the URL from the entry
 			url = ( active.url || "" );
 
-			// account for absolute urls instead of just relative urls use as hashes
+			// Account for absolute urls instead of just relative urls use as hashes
 			if ( !alreadyThere && url.indexOf( "#" ) > -1 ) {
 				url += $.mobile.dialogHashKey;
 			} else {
@@ -1091,9 +1095,8 @@ $.widget( "mobile.pagecontainer", {
 			}
 		}
 
-		// if title element wasn't found, try the page div data attr too
-		// If this is a deep-link or a reload ( active === undefined ) then just
-		// use pageTitle
+		// If title element wasn't found, try the page div data attr too.
+		// If this is a deep-link or a reload ( active === undefined ) then just use pageTitle
 		newPageTitle = ( !active ) ? pageTitle : toPage.jqmData( "title" ) ||
 		toPage.children( ":jqmData(role='header')" ).find( ".ui-title" ).text();
 		if ( !!newPageTitle && pageTitle === document.title ) {
@@ -1108,7 +1111,7 @@ $.widget( "mobile.pagecontainer", {
 			( ( historyDir && !activeIsInitialPage ) ? active.transition : undefined ) ||
 			( isDialog ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition );
 
-		//add page to history stack if it's not back or forward
+		// Add page to history stack if it's not back or forward
 		if ( !historyDir && alreadyThere ) {
 			$.mobile.navigate.history.getActive().pageUrl = pageUrl;
 		}
@@ -1116,7 +1119,7 @@ $.widget( "mobile.pagecontainer", {
 		// Set the location hash.
 		if ( url && !settings.fromHashChange ) {
 
-			// rebuilding the hash here since we loose it earlier on
+			// Rebuilding the hash here since we loose it earlier on
 			// TODO preserve the originally passed in path
 			if ( !$.mobile.path.isPath( url ) && url.indexOf( "#" ) < 0 ) {
 				url = "#" + url;
@@ -1138,13 +1141,13 @@ $.widget( "mobile.pagecontainer", {
 			}
 		}
 
-		//set page title
+		// Set page title
 		document.title = pageTitle;
 
-		//set "toPage" as activePage deprecated in 1.4 remove in 1.5
+		// Set "toPage" as activePage deprecated in 1.4 remove in 1.5
 		$.mobile.activePage = toPage;
 
-		//new way to handle activePage
+		// New way to handle activePage
 		this.activePage = toPage;
 
 		// If we're navigating back in the URL history, set reverse accordingly.
@@ -1161,12 +1164,12 @@ $.widget( "mobile.pagecontainer", {
 		cssTransitionDeferred.done( $.proxy( function( name, reverse, $to, $from, alreadyFocused ) {
 			$.mobile.removeActiveLinkClass();
 
-			//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
+			// If there's a duplicateCachedPage, remove it from the DOM now that it's hidden
 			if ( settings.duplicateCachedPage ) {
 				settings.duplicateCachedPage.remove();
 			}
 
-			// despite visibility: hidden addresses issue #2965
+			// Despite visibility: hidden addresses issue #2965
 			// https://github.com/jquery/jquery-mobile/issues/2965
 			if ( !alreadyFocused ) {
 				$.mobile.focusPage( toPage );
@@ -1178,7 +1181,7 @@ $.widget( "mobile.pagecontainer", {
 		}, this ) );
 	},
 
-	// determine the current base url
+	// Determine the current base url
 	_findBaseWithDefault: function() {
 		var closestBase = ( this.activePage &&
 			$.mobile.getClosestBaseUrl( this.activePage ) );
@@ -1186,15 +1189,15 @@ $.widget( "mobile.pagecontainer", {
 	}
 } );
 
-// The following handlers should be bound after mobileinit has been triggered
-// the following deferred is resolved in the init file
+// The following handlers should be bound after mobileinit has been triggered.
+// The following deferred is resolved in the init file.
 $.mobile.navreadyDeferred = $.Deferred();
 
-//these variables make all page containers use the same queue and only navigate one at a time
+// These variables make all page containers use the same queue and only navigate one at a time
 // queue to hold simultanious page transitions
 var pageTransitionQueue = [],
 
-	// indicates whether or not page is in process of transitioning
+	// Indicates whether or not page is in process of transitioning
 	isPageTransitioning = false;
 
 return $.mobile.pagecontainer;
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index 3b218500940..6af9f25bc7c 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -983,7 +983,7 @@ $.widget( "mobile.popup", {
 		urlHistory = $.mobile.navigate.history;
 		hashkey = $.mobile.dialogHashKey;
 		activePage = $.mobile.activePage;
-		currentIsDialog = ( activePage ? activePage.hasClass( "ui-dialog" ) : false );
+		currentIsDialog = ( activePage ? activePage.hasClass( "ui-page-dialog" ) : false );
 		this._pageUrl = url = urlHistory.getActive().url;
 		hasHash = ( url.indexOf( hashkey ) > -1 ) && !currentIsDialog &&
 			( urlHistory.activeIndex > 0 );
diff --git a/tests/integration/dialog-extension/backcompat-tests.html b/tests/integration/dialog-extension/backcompat-tests.html
new file mode 100644
index 00000000000..f727260666d
--- /dev/null
+++ b/tests/integration/dialog-extension/backcompat-tests.html
@@ -0,0 +1,148 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>jQuery Mobile Dialog Test Suite</title>
+	<script src="../../../external/requirejs/require.js"></script>
+	<script src="../../../js/requirejs.config.js"></script>
+	<script src="../../../js/jquery.tag.inserter.js"></script>
+	<script>
+		$( document ).bind( "mobileinit", function() {
+			// Expect content to inherit this theme when not explicitly set
+			$.mobile.page.prototype.options.contentTheme = "d";
+		} );
+	</script>
+	<script src="../../jquery.setNameSpace.js"></script>
+	<script src="../../jquery.testHelper.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
+	<script>
+		$.testHelper.asyncLoad( [
+			[
+				"widgets/page.dialog.backcompat",
+				"widgets/toolbar"
+			],
+			[ "init" ],
+			[ "backcompat_core.js" ]
+		] );
+	</script>
+
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
+	<link rel="stylesheet" href="../../jqm-tests.css"/>
+</head>
+<body>
+
+	<div id="qunit"></div>
+
+	<div data-nstest-role="page">
+		<a id="open-hash-test" href="#hash-test" data-nstest-rel="dialog">Hash Test</a>
+	</div>
+
+	<div data-nstest-role="dialog" id="hash-test">
+		<div data-nstest-role="header">
+			<h2>Hash Test</h2>
+		</div>
+		<div class="ui-content">
+			<p>Hash Test</p>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" id="corners-option-test">
+		<div data-nstest-role="header">
+			<h2>Corners Initially On</h2>
+		</div>
+		<div class="ui-content">
+			<p>Test</p>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" id="corners-option-test-false" data-nstest-corners="false">
+		<div data-nstest-role="header">
+			<h2>Corners Initially Off Test</h2>
+		</div>
+		<div class="ui-content">
+			<p>Test</p>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" id="corners-via-class-test">
+		<div data-nstest-role="header">
+			<h2>Corners Initially On</h2>
+		</div>
+		<div class="ui-content">
+			<p>Test</p>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" id="corners-via-class-test-false" data-nstest-classes='{ "ui-page-dialog-contain": "ui-overlay-shadow" }'>
+		<div data-nstest-role="header">
+			<h2>Corners Initially Off Test</h2>
+		</div>
+		<div class="ui-content">
+			<p>Test</p>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" data-nstest-enhanced="true" id="enhanced-corners-option-test" tabindex="0" class="ui-page ui-page-dialog ui-page-theme-a">
+		<div class="ui-page-dialog-contain ui-overlay-shadow ui-corner-all" role="dialog">
+			<div data-nstest-role="header" role="banner" class="ui-header ui-bar-inherit">
+				<a href="#" data-nstest-rel="back" class="ui-page-dialog-close-button ui-button ui-corner-all ui-button-icon-only ui-button-left" data-nstest-role="button">
+					Close
+					<span class="ui-page-dialog-close-button-icon ui-icon-delete ui-icon"></span>
+				</a>
+				<h2 class="ui-title" role="heading" aria-level="1">Corners Initially On</h2>
+			</div>
+			<div class="ui-content">
+				<p>Test</p>
+			</div>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" data-nstest-enhanced="true" id="enhanced-corners-option-test-false" data-nstest-corners="false" tabindex="0" class="ui-page ui-page-dialog ui-page-theme-a">
+		<div class="ui-page-dialog-contain ui-overlay-shadow" role="dialog">
+			<div data-nstest-role="header" role="banner" class="ui-header ui-bar-inherit">
+				<a href="#" data-nstest-rel="back" class="ui-page-dialog-close-button ui-button ui-corner-all ui-button-icon-only ui-button-left" data-nstest-role="button">
+					Close
+					<span class="ui-page-dialog-close-button-icon ui-icon-delete ui-icon"></span>
+				</a>
+				<h2 class="ui-title" role="heading" aria-level="1">Corners Initially Off Test</h2>
+			</div>
+			<div class="ui-content">
+				<p>Test</p>
+			</div>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" data-nstest-enhanced="true" id="enhanced-corners-via-class-test" tabindex="0" class="ui-page ui-page-dialog ui-page-theme-a">
+		<div class="ui-page-dialog-contain ui-overlay-shadow ui-corner-all" role="dialog">
+			<div data-nstest-role="header" role="banner" class="ui-header ui-bar-inherit">
+				<a href="#" data-nstest-rel="back" class="ui-page-dialog-close-button ui-button ui-corner-all ui-button-icon-only ui-button-left" data-nstest-role="button">
+					Close
+					<span class="ui-page-dialog-close-button-icon ui-icon-delete ui-icon"></span>
+				</a>
+				<h2 class="ui-title" role="heading" aria-level="1">Corners Initially On</h2>
+			</div>
+			<div class="ui-content">
+				<p>Test</p>
+			</div>
+		</div>
+	</div>
+
+	<div data-nstest-role="dialog" data-nstest-enhanced="true" id="enhanced-corners-via-class-test-false" data-nstest-classes="{ &quot;ui-page-dialog-contain&quot;: &quot;ui-overlay-shadow&quot; }" data-nstest-url="corners-via-class-test-false" tabindex="0" class="ui-page ui-page-dialog ui-page-theme-a">
+		<div class="ui-page-dialog-contain ui-overlay-shadow" role="dialog">
+			<div data-nstest-role="header" role="banner" class="ui-header ui-bar-inherit">
+				<a href="#" data-nstest-rel="back" class="ui-page-dialog-close-button ui-button ui-corner-all ui-button-icon-only ui-button-left" data-nstest-role="button">
+					Close
+					<span class="ui-page-dialog-close-button-icon ui-icon-delete ui-icon"></span>
+				</a>
+				<h2 class="ui-title" role="heading" aria-level="1">Corners Initially Off Test</h2>
+			</div>
+			<div class="ui-content">
+				<p>Test</p>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/tests/integration/dialog-extension/backcompat_core.js b/tests/integration/dialog-extension/backcompat_core.js
new file mode 100644
index 00000000000..72b64dda952
--- /dev/null
+++ b/tests/integration/dialog-extension/backcompat_core.js
@@ -0,0 +1,123 @@
+( function( QUnit, $ ) {
+
+asyncTest( "dialog hash is added when the dialog is opened and removed when closed", function() {
+	expect( 2 );
+
+	$.testHelper.pageSequence( [
+		function() {
+
+			// Bring up the dialog
+			$( "#open-hash-test" ).click();
+		},
+
+		function() {
+			// Make sure the dialog came up
+			ok( /&ui-state=dialog/.test( location.hash ),
+				"ui-state=dialog =~ location.hash", "dialog open" );
+
+			// Close the dialog
+			$.mobile.back();
+		},
+
+		function() {
+			ok( !( /&ui-state=dialog/.test( location.hash ) ),
+				"ui-state=dialog !~ location.hash" );
+			start();
+		}
+	] );
+} );
+
+function testClassPresence( assert, dialog, prefix, optionName, newOptionValue, expectedResult ) {
+	var assertion = expectedResult ? "hasClasses" : "lacksClasses";
+
+	if ( newOptionValue !== undefined ) {
+		dialog.page( "option", optionName, newOptionValue );
+	}
+	assert[ assertion ](
+		dialog.children( ".ui-page-dialog-contain" ), "ui-corner-all",
+			prefix + ": class ui-corner-all " + ( expectedResult ? "present" : "absent" ) +
+				" on wrapper" );
+	assert.strictEqual(
+		!!dialog.page( "option", "classes.ui-page-dialog-contain" ).match( /\bui-corner-all\b/ ),
+		expectedResult,
+		prefix + ": class ui-corner-all " + ( expectedResult ? "present": "absent" ) +
+			" in class key" );
+	assert.strictEqual(
+		dialog.page( "option", "corners" ), expectedResult,
+			prefix + ": option corners is " + expectedResult );
+}
+
+function genOptionSyncTests( prerenderedIdPrefix, messagePrefix ) {
+	asyncTest( "Option corners is synchronized to the class ui-corner-all", function( assert ) {
+		var option = "corners",
+			dialogOn = $( "#" + prerenderedIdPrefix + "corners-option-test" ),
+			dialogOff = $( "#" + prerenderedIdPrefix + "corners-option-test-false" );
+
+		$.testHelper.pageSequence( [
+			function() {
+				$( "body" ).pagecontainer( "change", dialogOn );
+			},
+			function() {
+				testClassPresence( assert, dialogOn, messagePrefix + ": Initially",
+					option, undefined, true );
+				testClassPresence( assert, dialogOn, messagePrefix + ": Turn off option",
+					option, false, false );
+				testClassPresence( assert, dialogOn, messagePrefix + ": Turn option back on",
+					option, true, true );
+				$.mobile.back();
+			},
+			function() {
+				$( "body" ).pagecontainer( "change", dialogOff );
+			},
+			function() {
+				testClassPresence( assert, dialogOff, messagePrefix + ": Initially",
+					option, undefined, false );
+				testClassPresence( assert, dialogOff, messagePrefix + ": Turn on option",
+					option, true, true );
+				testClassPresence( assert, dialogOff, messagePrefix + ": Turn option back off",
+					option, false, false );
+				$.mobile.back();
+			},
+			start
+		] );
+	} );
+
+	asyncTest( "Class ui-corner-all is synchronized to option corners", function( assert ) {
+		var option = "classes.ui-page-dialog-contain",
+			dialogOn = $( "#" + prerenderedIdPrefix + "corners-via-class-test" ),
+			dialogOff = $( "#" + prerenderedIdPrefix + "corners-via-class-test-false" );
+
+		$.testHelper.pageSequence( [
+			function() {
+				$( "body" ).pagecontainer( "change", dialogOn );
+			},
+			function() {
+				testClassPresence( assert, dialogOn, messagePrefix + ": Initially", option,
+					undefined, true );
+				testClassPresence( assert, dialogOn, messagePrefix + ": Turn off option", option,
+					"ui-overlay-shadow", false );
+				testClassPresence( assert, dialogOn, messagePrefix + ": Turn option back on",
+					option, "ui-overlay-shadow ui-corner-all", true );
+				$.mobile.back();
+			},
+			function() {
+				$( "body" ).pagecontainer( "change", dialogOff );
+			},
+			function() {
+				testClassPresence( assert, dialogOff, messagePrefix + ": Initially", option,
+					undefined, false );
+				testClassPresence( assert, dialogOff, messagePrefix + ": Turn on option", option,
+					"ui-overlay-shadow ui-corner-all", true );
+				testClassPresence( assert, dialogOff, messagePrefix + ": Turn option back off",
+					option, "ui-overlay-shadow", false );
+				$.mobile.back();
+			},
+			start
+		] );
+	} );
+}
+
+genOptionSyncTests( "", "Normal" );
+genOptionSyncTests( "enhanced-", "Pre-rendered" );
+
+} )( QUnit, jQuery );
diff --git a/tests/integration/dialog-extension/dialog_events.js b/tests/integration/dialog-extension/dialog_events.js
index 785a743ad4e..f9058a64044 100644
--- a/tests/integration/dialog-extension/dialog_events.js
+++ b/tests/integration/dialog-extension/dialog_events.js
@@ -1,51 +1,95 @@
 /*
  * mobile dialog unit tests
  */
-( function( $ ) {
+( function( QUnit, $ ) {
 var home = $.mobile.path.parseUrl( location.pathname ).directory,
 	homeWithSearch = home + location.search;
 
-module( "dialog", {
+function jqmDataSelector( expression ) {
+	return "[data-" + $.mobile.ns + expression + "]";
+}
+
+QUnit.module( "dialog", {
 	setup: function() {
 		$.mobile.page.prototype.options.contentTheme = "d";
 		$.testHelper.navReset( homeWithSearch );
 	}
 } );
 
-asyncTest( "Test option data-close-button", function() {
-	expect( 5 );
+QUnit.asyncTest( "test option overlayTheme", function( assert ) {
+	$.testHelper.pageSequence( [
+
+		function() {
+			$( "#open-overlayTheme-test" ).click();
+		},
+
+		function() {
+			assert.strictEqual( $( ".ui-page-active" ).attr( "id" ), "overlayTheme-test",
+				"overlayTheme test dialog is active" );
+			assert.hasClasses( $( "body" ), "ui-overlay-x",
+				"Page container has swatch specified in the data attribute" );
+
+			$( ".ui-page-active" ).page( "option", "overlayTheme", "y" );
+			assert.hasClasses( $( "body" ), "ui-overlay-y",
+				"Page container has swatch applied via option change" );
+
+			$.mobile.back();
+		},
+
+		QUnit.start
+
+	] );
+} );
+
+QUnit.asyncTest( "Test option data-close-btn", function( assert ) {
+	expect( 7 );
 
 	$.testHelper.pageSequence( [
 		function() {
-			// bring up the dialog
+			// Bring up the dialog
 			$( "#close-button-test-link" ).click();
 		},
 
 		function() {
-			var a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 0, "Initially, the dialog header has no anchor elements (option value 'none')" );
+			var a,
+				dialog = $( "#close-button-test" );
+
+			assert.strictEqual( $( "#close-button-test .ui-header a" ).length, 0,
+				"Initially, the dialog header has no anchor elements (option value 'none')" );
 
-			$( "#close-button-test" ).page( "option", "closeBtn", "left" );
+			dialog.page( "option", "closeBtn", "left" );
 			a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'left'" );
-			ok( a.hasClass( "ui-button-left" ), "The close button has class ui-button-left when the closeBtn option is set to 'left'" );
-			$( "#close-button-test" ).page( "option", "closeBtn", "right" );
+			assert.strictEqual( a.length, 1,
+				"The dialog header has exactly one anchor when the option value is 'left'" );
+			assert.hasClasses( a, "ui-button-left",
+				"The close button has class ui-button-left when the closeBtn option is set " +
+				"to 'left'" );
+
+			dialog.page( "option", {
+				"closeBtn": "right",
+				"closeBtnText": "Custom text"
+			} );
 			a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'right'" );
-			ok( a.hasClass( "ui-button-right" ), "The close button has class ui-button-right when the closeBtn option is set to 'right'" );
-
+			assert.strictEqual( a.length, 1,
+				"The dialog header has exactly one anchor when the option value is 'right'" );
+			assert.hasClasses( a, "ui-button-right",
+				"The close button has class ui-button-right when the closeBtn option is set " +
+				"to 'right'" );
+			assert.strictEqual( a.text(), "Custom text", "Anchor text updated via option" );
+
+			dialog.page( "option", "closeBtn", "none" );
+			assert.strictEqual( $( "#close-button-test .ui-header a" ).length, 0,
+				"Initially, the dialog header has no anchor elements (option value 'none')" );
 		},
 
-		function() {
-			start();
-		}
+		QUnit.start
 	] );
 } );
 
-asyncTest( "clicking dialog 'Close' button twice in quick succession does not cause the browser history to retreat by two", function() {
+QUnit.asyncTest( "Clicking dialog 'Close' button renders it unclickable", function( assert ) {
 	var correctLocation;
 
-	expect( 1 );
+	assert.expect( 4 );
 
 	$.testHelper.pageSequence( [
 		function() {
@@ -53,24 +97,35 @@ asyncTest( "clicking dialog 'Close' button twice in quick succession does not ca
 		},
 
 		function() {
-
 			$.mobile.changePage( $( "#doubleCloseTestPage" ) );
 		},
 
 		function() {
-
+			correctLocation = location.href;
 			$( "#doubleCloseTestPage a" ).click();
 		},
 
+		function() {
+			var closeButton = $( "#foo-dialog a" ).click();
+
+			assert.strictEqual( closeButton.css( "pointer-events" ), "none",
+				"Close button has pointer events turned off post-click" );
+			assert.strictEqual( closeButton.attr( "tabindex" ), "-1",
+				"Close button tabindex is set to -1 post-click" );
+		},
+
 		function( timedOut ) {
-			ok( !timedOut, "Clicking dialog 'Close' has resulted in a pagechange event" );
-			start();
-		}
+			assert.ok( !timedOut, "Clicking dialog 'Close' has resulted in a pagechange event" );
+			assert.ok( location.href === correctLocation, "Location is correct afterwards" );
+			$.mobile.back();
+		},
+
+		QUnit.start
 	] );
 } );
 
-asyncTest( "dialog element with no theming", function() {
-	expect( 5 );
+QUnit.asyncTest( "dialog element with no theming", function( assert ) {
+	assert.expect( 4 );
 
 	$.testHelper.pageSequence( [
 		function() {
@@ -78,7 +133,7 @@ asyncTest( "dialog element with no theming", function() {
 		},
 
 		function() {
-			//bring up the dialog
+			// Bring up the dialog
 			$( "#link-a" ).click();
 		},
 
@@ -86,22 +141,25 @@ asyncTest( "dialog element with no theming", function() {
 			var dialog = $( "#dialog-a" );
 
 			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-a" ), "Expected explicit theme ui-page-theme-a" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-a" ), "Expected default overlay theme ui-overlay-a" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=content)" ).hasClass( "ui-body-" + $.mobile.page.prototype.options.contentTheme ), "Expect content to inherit from $.mobile.page.prototype.options.contentTheme" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
-
-			start();
+			assert.hasClasses( dialog, "ui-page-theme-a",
+				"Expected explicit theme ui-page-theme-a" );
+			assert.hasClasses( $( "body" ), "ui-overlay-a",
+				"Expected default overlay theme ui-overlay-a" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "dialog element with data-theme", function() {
+QUnit.asyncTest( "dialog element with data-theme", function( assert ) {
 	// Reset fallback theme for content
 	$.mobile.page.prototype.options.contentTheme = null;
 
-	expect( 6 );
+	expect( 5 );
 
 	$.testHelper.pageSequence( [
 		function() {
@@ -109,7 +167,7 @@ asyncTest( "dialog element with data-theme", function() {
 		},
 
 		function() {
-			//bring up the dialog
+			// Bring up the dialog
 			$( "#link-b" ).click();
 		},
 
@@ -117,20 +175,24 @@ asyncTest( "dialog element with data-theme", function() {
 			var dialog = $( "#dialog-b" );
 
 			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-e" ), "Expected explicit theme ui-page-theme-e" );
-			ok( !$.mobile.pageContainer.hasClass( "ui-overlay-b" ), "Expected no overlay theme ui-overlay-b" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-a" ), "Expected default overlay theme ui-overlay-a" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=content)" ).hasClass( "ui-body-e" ), "Expect content to inherit from data-theme" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
-
-			start();
+			assert.hasClasses( dialog, "ui-page-theme-e",
+				"Expected explicit theme ui-page-theme-e" );
+			assert.lacksClasses( $( "body" ), "ui-overlay-b",
+				"Expected no overlay theme ui-overlay-b" );
+			assert.hasClasses( $( "body" ), "ui-overlay-a",
+				"Expected default overlay theme ui-overlay-a" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "dialog element with data-theme & data-overlay-theme", function() {
-	expect( 5 );
+QUnit.asyncTest( "dialog element with data-theme & data-overlay-theme", function( assert ) {
+	expect( 4 );
 
 	$.testHelper.pageSequence( [
 		function() {
@@ -138,50 +200,81 @@ asyncTest( "dialog element with data-theme & data-overlay-theme", function() {
 		},
 
 		function() {
-			//bring up the dialog
+			// Bring up the dialog
 			$( "#link-c" ).click();
 		},
 
 		function() {
 			var dialog = $( "#dialog-c" );
 			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-e" ), "Expected explicit theme ui-page-theme-e" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-b" ), "Expected explicit overlay theme ui-overlay-b" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=content)" ).hasClass( "ui-body-" + $.mobile.page.prototype.options.contentTheme ), "Expect content to inherit from $.mobile.page.prototype.options.contentTheme" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
-
-			start();
+			assert.hasClasses( dialog, "ui-page-theme-e",
+				"Expected explicit theme ui-page-theme-e" );
+			assert.hasClasses( $( "body" ), "ui-overlay-b",
+				"Expected explicit overlay theme ui-overlay-b" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "page container is updated to dialog overlayTheme at pagebeforeshow", function() {
-	var pageTheme;
+QUnit.asyncTest( "page container is updated to dialog overlayTheme at pagebeforeshow",
+	function( assert ) {
+		var pageTheme;
 
-	expect( 1 );
+		expect( 1 );
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.changePage( "#mypage" );
-		},
+		$.testHelper.pageSequence( [
+			function() {
+				$.mobile.changePage( "#mypage" );
+			},
+
+			function() {
+				// Bring up the dialog
+				$( "#foo-dialog-link" ).click();
+			},
+
+			function() {
+				pageTheme = "ui-overlay-" +
+					$( ".ui-page-active" ).page( "option", "overlayTheme" );
+
+				$.mobile.pageContainer.removeClass( pageTheme );
+
+				$( ".ui-page-active" )
+					.bind( "pagebeforeshow", function() {
+						assert.ok( $.mobile.pageContainer.hasClass( pageTheme ),
+							"Page container has the same theme as the dialog overlayTheme on " +
+								"pagebeforeshow" );
+						QUnit.start();
+					} ).trigger( "pagebeforeshow" );
+			}
+		] );
+	} );
+
+QUnit.asyncTest( "pre-rendered dialog options work", function( assert ) {
+	expect( 3 );
 
+	$.testHelper.pageSequence( [
 		function() {
-			//bring up the dialog
-			$( "#foo-dialog-link" ).click();
+			$( "#open-enhanced-dialog" ).click();
 		},
-
 		function() {
-			pageTheme = "ui-overlay-" + $.mobile.activePage.page( "option", "overlayTheme" );
+			assert.strictEqual( $( ".ui-page-active" ).attr( "id" ), "enhanced-dialog",
+				"enhanced dialog is the current page" );
 
-			$.mobile.pageContainer.removeClass( pageTheme );
+			$( "#enhanced-dialog" ).page( "option", "closeBtn", "right" );
+			assert.hasClasses( $( "#enhanced-dialog a" ), "ui-button-right",
+				"enhanced dialog button location can be changed" );
+			assert.lacksClasses( $( "#enhanced-dialog a" ), "ui-button-left",
+				"enhanced dialog button does not retain old location" );
 
-			$.mobile.activePage
-				.bind( "pagebeforeshow", function() {
-					ok( $.mobile.pageContainer.hasClass( pageTheme ), "Page container has the same theme as the dialog overlayTheme on pagebeforeshow" );
-					start();
-				} ).trigger( "pagebeforeshow" );
-		}
+			$.mobile.back();
+		},
+		QUnit.start
 	] );
 } );
-} )( jQuery );
+
+} )( QUnit, jQuery );
diff --git a/tests/integration/dialog-extension/index.html b/tests/integration/dialog-extension/index.html
index f619940cddc..b530feb04eb 100644
--- a/tests/integration/dialog-extension/index.html
+++ b/tests/integration/dialog-extension/index.html
@@ -7,34 +7,32 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
+	<script src="../../jquery.setNameSpace.js"></script>
+	<script src="../../jquery.testHelper.js"></script>
 	<script>
-		$(document).bind('mobileinit',function(){
+		$( document ).bind( "mobileinit", function() {
 			// Expect content to inherit this theme when not explicitly set
 			$.mobile.page.prototype.options.contentTheme = "d";
-		});
+		} );
 	</script>
-	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
-			[ "widgets/page" ],
+		$.testHelper.asyncLoad( [
+			[ "widgets/enhancer.backcompat" ],
 			[
 				"widgets/page.dialog",
 				"widgets/toolbar"
 			],
 			[ "init" ],
-			[
-				"dialog_events.js"
-			]
-		]);
+			[ "dialog_events.js" ]
+		] );
 	</script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
@@ -46,10 +44,12 @@
 		<a href="#dialog-a" id="link-a" data-nstest-role="button" data-nstest-inline="true" >no theme set</a>
 		<a href="#dialog-b" id="link-b" data-nstest-role="button" data-nstest-inline="true" >data-theme set</a>
 		<a href="#dialog-c" id="link-c" data-nstest-role="button" data-nstest-inline="true" >data-theme & data-nstest-overlay-theme set</a>
+		<a href="#overlayTheme-test" id="open-overlayTheme-test">overlayTheme test</a>
+		<a href="#enhanced-dialog" id="open-enhanced-dialog">Open enhanced dialog</a>
 	</div>
 
 	<div id="doubleCloseTestPage" data-nstest-role="page" data-nstest-dialog="true">
-		<div data-nstest-role="content">
+		<div class="ui-content">
 			<a id="doubleCloseDialogOpener" href="#foo-dialog" >Dialog</a>
 		</div>
 	</div>
@@ -58,7 +58,7 @@
 		<div  data-nstest-role="header" data-nstest-position="inline">
 			<h1>Dialog</h1>
 		</div>
-		<div data-nstest-role="content" >
+		<div class="ui-content">
 			<a href="#" id="internal-link">foo</a>
 		</div>
 		<div data-nstest-role="footer">
@@ -70,7 +70,19 @@ <h1>Dialog</h1>
 		<div  data-nstest-role="header" data-nstest-position="inline">
 			<h1>Dialog</h1>
 		</div>
-		<div data-nstest-role="content" >
+		<div class="ui-content">
+			<a href="#" id="internal-link">foo</a>
+		</div>
+		<div data-nstest-role="footer">
+			footer
+		</div>
+	</div>
+
+	<div id="overlayTheme-test" data-nstest-role="page" data-nstest-dialog="true" data-nstest-overlay-theme="x">
+		<div  data-nstest-role="header" data-nstest-position="inline">
+			<h1>Dialog</h1>
+		</div>
+		<div class="ui-content">
 			<a href="#" id="internal-link">foo</a>
 		</div>
 		<div data-nstest-role="footer">
@@ -82,7 +94,7 @@ <h1>Dialog</h1>
 		<div data-nstest-role="header" data-nstest-position="inline">
 			<h1> No theme set </h1>
 		</div>
-		<div data-nstest-role="content">
+		<div class="ui-content">
 			 Some text here....
 		</div>
 		<div data-nstest-role="footer">
@@ -94,7 +106,7 @@ <h1> No theme set </h1>
 		<div data-nstest-role="header">
 			<h1> data-nstest-theme set </h1>
 		</div>
-		<div data-nstest-role="content">
+		<div class="ui-content">
 			 Some text here....
 		</div>
 		<div data-nstest-role="footer">
@@ -106,7 +118,7 @@ <h1> data-nstest-theme set </h1>
 		<div data-nstest-role="header">
 			<h1> data-nstest-theme & data-nstest-overlay-theme set </h1>
 		</div>
-		<div data-nstest-role="content">
+		<div class="ui-content">
 			 Some text here....
 		</div>
 		<div data-nstest-role="footer">
@@ -114,5 +126,19 @@ <h1> data-nstest-theme & data-nstest-overlay-theme set </h1>
 		</div>
 	</div>
 
+	<div data-nstest-role="page" id="enhanced-dialog" data-nstest-enhanced="true" data-nstest-dialog="true" class="ui-page ui-page-theme-a ui-dialog">
+		<div role="dialog" class="ui-page-dialog-contain ui-overlay-shadow ui-corner-all">
+			<div data-nstest-role="header" role="banner" data-nstest-enhanced="true" class="ui-header ui-bar-b">
+				<a href="#" data-nstest-rel="back" class="ui-page-dialog-close-button ui-button ui-corner-all ui-button-icon-only ui-button-left ui-shadow ui-widget" data-nstest-role="button" role="button">
+					Close
+					<span class="ui-page-dialog-close-button-icon ui-icon-delete ui-icon"></span>
+				</a>
+				<h1 class="ui-title" role="heading" aria-level="1">Dialog</h1>
+			</div>
+			<div class="ui-content">
+				<p>Contents</p>
+			</div>
+		</div>
+	</div>
 </body>
 </html>
diff --git a/tests/integration/dialog-extension/no-hash-tests.html b/tests/integration/dialog-extension/no-hash-tests.html
index 8b8dbf22730..25392076b45 100644
--- a/tests/integration/dialog-extension/no-hash-tests.html
+++ b/tests/integration/dialog-extension/no-hash-tests.html
@@ -8,35 +8,30 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script>
-		$(document).bind('mobileinit',function(){
+		$( document ).bind( "mobileinit", function() {
 			$.mobile.changePage.defaults.changeHash = false;
 			$.mobile.hashListeningEnabled = false;
 			$.mobile.pushStateEnabled = false;
-		});
+		} );
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[ "widgets/page" ],
 			[
-				"widgets/dialog",
-				//"widgets/dialog-extension",
+				"widgets/page.dialog.backcompat",
 				"widgets/toolbar"
 			],
 			[ "init" ],
-			[
-				"dialog_no_hash.js"
-			]
-		]);
+			[ "dialog_no_hash.js" ]
+		] );
 	</script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/dialog/dialog_events.js b/tests/integration/dialog/dialog_events.js
index 425183415eb..2079dd85778 100644
--- a/tests/integration/dialog/dialog_events.js
+++ b/tests/integration/dialog/dialog_events.js
@@ -1,116 +1,60 @@
 /*
  * mobile dialog unit tests
  */
-( function( $ ) {
+( function( QUnit, $ ) {
 var home = $.mobile.path.parseUrl( location.pathname ).directory,
 	homeWithSearch = home + location.search;
 
-module( "dialog", {
+function jqmDataSelector( expression ) {
+	return "[data-" + $.mobile.ns + expression + "]";
+}
+
+QUnit.module( "dialog", {
 	setup: function() {
 		$.mobile.page.prototype.options.contentTheme = "d";
 		$.testHelper.navReset( homeWithSearch );
 	}
 } );
 
-asyncTest( "dialog hash is added when the dialog is opened and removed when closed", function() {
-	expect( 2 );
+QUnit.asyncTest( "Test option data-close-btn", function( assert ) {
+	expect( 5 );
 
 	$.testHelper.pageSequence( [
 		function() {
-			//bring up the dialog
-			$( "#foo-dialog-link" ).click();
-		},
-
-		function() {
-			var fooDialog = $( "#foo-dialog" );
-
-			// make sure the dialog came up
-			ok( /&ui-state=dialog/.test( location.hash ), "ui-state=dialog =~ location.hash", "dialog open" );
-
-			// close the dialog
-			$( ".ui-dialog" ).dialog( "close" );
-		},
-
-		function() {
-			ok( !( /&ui-state=dialog/.test( location.hash ) ), "ui-state=dialog !~ location.hash" );
-			start();
-		}
-	] );
-} );
-
-asyncTest( "Test option data-close-button", function() {
-	expect( 7 );
 
-	$.testHelper.pageSequence( [
-		function() {
-			// bring up the dialog
+			// Bring up the dialog
 			$( "#close-button-test-link" ).click();
 		},
 
 		function() {
 			var a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 0, "Initially, the dialog header has no anchor elements (option value 'none')" );
+			assert.strictEqual( a.length, 0,
+				"Initially, the dialog header has no anchor elements (option value 'none')" );
 
-			$( "#close-button-test" ).dialog( "option", "closeBtn", "left" );
+			$( "#close-button-test" ).page( "option", "closeBtn", "left" );
 			a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'left'" );
-			ok( a.hasClass( "ui-button-left" ), "The close button has class ui-button-left when the closeBtn option is set to 'left'" );
-			deepEqual( a.attr( "role" ), "button", "The close button has the attribute " + '"' + "role='button'" + '"' + "set" );
+			assert.strictEqual( a.length, 1,
+				"The dialog header has exactly one anchor when the option value is 'left'" );
+			assert.hasClasses( a, "ui-button-left",
+				"The close button has class ui-button-left when the closeBtn option is 'left'" );
 
-			$( "#close-button-test" ).dialog( "option", "closeBtn", "right" );
+			$( "#close-button-test" ).page( "option", "closeBtn", "right" );
 			a = $( "#close-button-test .ui-header a" );
-			deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'right'" );
-			ok( a.hasClass( "ui-button-right" ), "The close button has class ui-button-right when the closeBtn option is set to 'right'" );
-			deepEqual( a.attr( "role" ), "button", "The close button has the attribute " + '"' + "role='button'" + '"' + "set" );
+			assert.strictEqual( a.length, 1,
+				"The dialog header has eactly one anchor when the option value is 'right'" );
+			assert.hasClasses( a, "ui-button-right",
+				"The close button has class ui-button-right when the closeBtn option is 'right'" );
 
-			$( "#close-button-test" ).dialog( "close" );
+			$.mobile.back();
 		},
 
 		function() {
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "clicking dialog 'Close' button twice in quick succession does not cause the browser history to retreat by two", function() {
-	var correctLocation;
-
-	expect( 3 );
-
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.changePage( $( "#mypage" ) );
-		},
-
-		function() {
-			$.mobile.changePage( $( "#doubleCloseTestPage" ) );
-		},
-
-		function() {
-			correctLocation = location.href;
-			$( "#doubleCloseTestPage a" ).click();
-		},
-
-		function() {
-			$( "#foo-dialog a" ).click();
-			setTimeout( function() {
-				$( "#foo-dialog a" ).click();
-			}, 0 );
-		},
-
-		function( timedOut ) {
-			ok( !timedOut, "Clicking dialog 'Close' has resulted in a pagechange event" );
-		},
-
-		function( timedOut ) {
-			ok( timedOut, "Clicking dialog 'Close' has not resulted in two pagechange events" );
-			ok( location.href === correctLocation, "Location is correct afterwards" );
-			start();
-		}
-	] );
-} );
-
-asyncTest( "dialog element with no theming", function() {
+QUnit.asyncTest( "dialog element with no theming", function( assert ) {
 	expect( 4 );
 
 	$.testHelper.pageSequence( [
@@ -119,7 +63,8 @@ asyncTest( "dialog element with no theming", function() {
 		},
 
 		function() {
-			//bring up the dialog
+
+			// Bring up the dialog
 			$( "#link-a" ).click();
 		},
 
@@ -127,17 +72,22 @@ asyncTest( "dialog element with no theming", function() {
 			var dialog = $( "#dialog-a" );
 
 			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-a" ), "Expected explicit theme ui-page-theme-a" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-a" ), "Expected default overlay theme ui-overlay-a" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
-
-			start();
+			assert.hasClasses( dialog, "ui-page-theme-a",
+				"Expected explicit theme ui-page-theme-a" );
+			assert.hasClasses( $.mobile.pageContainer, "ui-overlay-a",
+				"Expected default overlay theme ui-overlay-a" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "dialog element with data-theme", function() {
+QUnit.asyncTest( "dialog element with data-theme", function( assert ) {
+
 	// Reset fallback theme for content
 	$.mobile.page.prototype.options.contentTheme = null;
 
@@ -149,7 +99,8 @@ asyncTest( "dialog element with data-theme", function() {
 		},
 
 		function() {
-			//bring up the dialog
+
+			// Bring up the dialog
 			$( "#link-b" ).click();
 		},
 
@@ -157,18 +108,23 @@ asyncTest( "dialog element with data-theme", function() {
 			var dialog = $( "#dialog-b" );
 
 			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-e" ), "Expected explicit theme ui-page-theme-e" );
-			ok( !$.mobile.pageContainer.hasClass( "ui-overlay-b" ), "Expected no overlay theme ui-overlay-b" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-a" ), "Expected default overlay theme ui-overlay-a" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
-
-			start();
+			assert.hasClasses( dialog, "ui-page-theme-e",
+				"Expected explicit theme ui-page-theme-e" );
+			assert.lacksClasses( $.mobile.pageContainer, "ui-overlay-b",
+				"Expected no overlay theme ui-overlay-b" );
+			assert.hasClasses( $.mobile.pageContainer, "ui-overlay-a",
+				"Expected default overlay theme ui-overlay-a" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "dialog element with data-theme & data-overlay-theme", function() {
+QUnit.asyncTest( "dialog element with data-theme & data-overlay-theme", function( assert ) {
 	expect( 4 );
 
 	$.testHelper.pageSequence( [
@@ -177,50 +133,59 @@ asyncTest( "dialog element with data-theme & data-overlay-theme", function() {
 		},
 
 		function() {
-			//bring up the dialog
+
+			// Bring up the dialog
 			$( "#link-c" ).click();
 		},
 
 		function() {
 			var dialog = $( "#dialog-c" );
-			// Assert dialog theme inheritance (issue 1375):
-			ok( dialog.hasClass( "ui-page-theme-e" ), "Expected explicit theme ui-page-theme-e" );
-			ok( $.mobile.pageContainer.hasClass( "ui-overlay-b" ), "Expected explicit overlay theme ui-overlay-b" );
-			ok( dialog.find( ":jqmData(role=header)" ).hasClass( "ui-bar-inherit" ), "Expected header to inherit from dialog" );
-			ok( dialog.find( ":jqmData(role=footer)" ).hasClass( "ui-bar-inherit" ), "Expected footer to inherit from dialog" );
 
-			start();
+			// Assert dialog theme inheritance (issue 1375):
+			assert.hasClasses( dialog, "ui-page-theme-e",
+				"Expected explicit theme ui-page-theme-e" );
+			assert.hasClasses( $.mobile.pageContainer, "ui-overlay-b",
+				"Expected explicit overlay theme ui-overlay-b" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=header" ) ), "ui-bar-inherit",
+				"Expected header to inherit from dialog" );
+			assert.hasClasses( dialog.find( jqmDataSelector( "role=footer" ) ), "ui-bar-inherit",
+				"Expected footer to inherit from dialog" );
+
+			QUnit.start();
 		}
 	] );
 } );
 
+QUnit.asyncTest( "pagecontainer is set to dialog overlayTheme at pagebeforeshow",
+	function( assert ) {
+		var pageTheme;
 
-asyncTest( "page container is updated to dialog overlayTheme at pagebeforeshow", function() {
-	var pageTheme;
+		expect( 1 );
 
-	expect( 1 );
+		$.testHelper.pageSequence( [
+			function() {
+				$.mobile.changePage( "#mypage" );
+			},
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.changePage( "#mypage" );
-		},
+			function() {
 
-		function() {
-			//bring up the dialog
-			$( "#foo-dialog-link" ).click();
-		},
+				// Bring up the dialog
+				$( "#foo-dialog-link" ).click();
+			},
 
-		function() {
-			pageTheme = "ui-overlay-" + $.mobile.activePage.dialog( "option", "overlayTheme" );
+			function() {
+				pageTheme = "ui-overlay-" + $.mobile.activePage.page( "option", "overlayTheme" );
 
-			$.mobile.pageContainer.removeClass( pageTheme );
+				$.mobile.pageContainer.removeClass( pageTheme );
 
-			$.mobile.activePage
-				.bind( "pagebeforeshow", function() {
-					ok( $.mobile.pageContainer.hasClass( pageTheme ), "Page container has the same theme as the dialog overlayTheme on pagebeforeshow" );
-					start();
-				} ).trigger( "pagebeforeshow" );
-		}
-	] );
-} );
-} )( jQuery );
+				$.mobile.activePage
+					.bind( "pagebeforeshow", function() {
+						assert.hasClasses( $.mobile.pageContainer, pageTheme,
+							"Page container has the same theme as the dialog overlayTheme on " +
+								"pagebeforeshow" );
+						QUnit.start();
+					} ).trigger( "pagebeforeshow" );
+			}
+		] );
+	} );
+} )( QUnit, jQuery );
diff --git a/tests/integration/dialog/index.html b/tests/integration/dialog/index.html
index 222fd0d144d..49202149cec 100644
--- a/tests/integration/dialog/index.html
+++ b/tests/integration/dialog/index.html
@@ -8,33 +8,29 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script>
-		$(document).bind('mobileinit',function(){
+		$( document ).bind( "mobileinit", function() {
 			// Expect content to inherit this theme when not explicitly set
 			$.mobile.page.prototype.options.contentTheme = "d";
-		});
+		} );
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[
-				"widgets/dialog",
-				"widgets/page",
+				"widgets/page.dialog",
 				"widgets/toolbar"
 			],
 			[ "init" ],
-			[
-				"dialog_events.js"
-			]
-		]);
+			[ "dialog_events.js" ]
+		] );
 	</script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
@@ -43,9 +39,9 @@
 	<div id="mypage" data-nstest-role="page" data-nstest-theme="a">
 		<a href="#foo-dialog" id="foo-dialog-link" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog"></a>
 		<a href="#close-button-test" id="close-button-test-link" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog">Go</a>
-		<a href="#dialog-a" id="link-a" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog">no theme set</a>
-		<a href="#dialog-b" id="link-b" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog">data-theme set</a>
-		<a href="#dialog-c" id="link-c" data-nstest-role="button" data-nstest-inline="true" data-nstest-rel="dialog">data-theme & data-nstest-overlay-theme set</a>
+		<a href="#dialog-a" id="link-a" data-nstest-role="button" data-nstest-inline="true">no theme set</a>
+		<a href="#dialog-b" id="link-b" data-nstest-role="button" data-nstest-inline="true">data-theme set</a>
+		<a href="#dialog-c" id="link-c" data-nstest-role="button" data-nstest-inline="true">data-theme & data-nstest-overlay-theme set</a>
 	</div>
 
 	<div id="doubleCloseTestPage" data-nstest-role="page">
@@ -54,7 +50,7 @@
 		</div>
 	</div>
 
-	<div id="foo-dialog" data-nstest-role="dialog" data-nstest-theme="b">
+	<div id="foo-dialog" data-nstest-dialog="true" data-nstest-theme="b">
 		<div  data-nstest-role="header" data-nstest-position="inline">
 			<h1>Dialog</h1>
 		</div>
@@ -66,7 +62,7 @@ <h1>Dialog</h1>
 		</div>
 	</div>
 
-	<div id="close-button-test" data-nstest-role="dialog" data-nstest-theme="b" data-nstest-close-btn="none">
+	<div id="close-button-test" data-nstest-dialog="true" data-nstest-theme="b" data-nstest-close-btn="none">
 		<div  data-nstest-role="header" data-nstest-position="inline">
 			<h1>Dialog</h1>
 		</div>
@@ -78,7 +74,7 @@ <h1>Dialog</h1>
 		</div>
 	</div>
 
-	<div data-nstest-role="page" id="dialog-a">
+	<div data-nstest-role="page" id="dialog-a" data-nstest-dialog="true">
 		<div data-nstest-role="header" data-nstest-position="inline">
 			<h1> No theme set </h1>
 		</div>
@@ -90,7 +86,7 @@ <h1> No theme set </h1>
 		</div>
 	</div>
 
-	<div data-nstest-role="page" data-nstest-theme="e" id="dialog-b">
+	<div data-nstest-dialog="true" data-nstest-theme="e" id="dialog-b">
 		<div data-nstest-role="header">
 			<h1> data-nstest-theme set </h1>
 		</div>
@@ -102,7 +98,7 @@ <h1> data-nstest-theme set </h1>
 		</div>
 	</div>
 
-	<div data-nstest-role="page" id="dialog-c" data-nstest-overlay-theme="b" data-nstest-theme="e">
+	<div data-nstest-dialog="true" id="dialog-c" data-nstest-overlay-theme="b" data-nstest-theme="e">
 		<div data-nstest-role="header">
 			<h1> data-nstest-theme & data-nstest-overlay-theme set </h1>
 		</div>
diff --git a/tests/integration/dialog/no-hash-tests.html b/tests/integration/dialog/no-hash-tests.html
index 0a405dce80e..b394fe87817 100644
--- a/tests/integration/dialog/no-hash-tests.html
+++ b/tests/integration/dialog/no-hash-tests.html
@@ -8,34 +8,29 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script>
-		$(document).bind('mobileinit',function(){
+		$(document).bind('mobileinit',function() {
 			$.mobile.changePage.defaults.changeHash = false;
 			$.mobile.hashListeningEnabled = false;
 			$.mobile.pushStateEnabled = false;
-		});
+		} );
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[
-				"widgets/dialog",
-				"widgets/page",
+				"widgets/page.dialog.backcompat",
 				"widgets/toolbar"
 			],
 			[ "init" ],
-			[
-				"dialog_no_hash.js"
-			]
-		]);
+			[ "dialog_no_hash.js" ]
+		] );
 	</script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/navigation/index.html b/tests/integration/navigation/index.html
index 0116aa1afcd..9cba5fa848a 100644
--- a/tests/integration/navigation/index.html
+++ b/tests/integration/navigation/index.html
@@ -9,18 +9,18 @@
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script type="text/javascript">
-		$( document ).bind( "mobileinit", function(){
+		$( document ).bind( "mobileinit", function() {
 				$.testHelper.setPushState();
-		});
+		} );
 	</script>
 	<script src="../../../js/"></script>
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script type="text/javascript" src="navigation_core.js"></script>
 	<script type="text/javascript" src="navigation_paths.js"></script>
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 	<div id="qunit"></div>
diff --git a/tests/integration/navigation/navigation_base.js b/tests/integration/navigation/navigation_base.js
index 0f61b7dfa94..a7d15b2e4f7 100644
--- a/tests/integration/navigation/navigation_base.js
+++ b/tests/integration/navigation/navigation_base.js
@@ -16,7 +16,7 @@ module( 'jquery.mobile.navigation.js - base tag', {
 	}
 } );
 
-asyncTest( "can navigate between internal and external pages", function() {
+asyncTest( "can navigate between internal and external pages", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			// Navigate from default internal page to another internal page.
@@ -25,7 +25,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the 2nd internal page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				push: home + "#internal-page-2",
 				hash: "internal-page-2",
 				report: "navigate to internal page"
@@ -38,7 +38,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: baseDir + "base-page-1.html",
 				report: "navigate from internal page to page in base directory"
 			} );
@@ -49,7 +49,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: baseDir + "base-page-2.html",
 				report: "navigate from base directory page to another base directory page"
 			} );
@@ -60,9 +60,10 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-1.html",
-				report: "navigate from base directory page to a page in a different directory hierarchy"
+				report: "navigate from base directory page to a page in a different directory " +
+					"hierarchy"
 			} );
 
 			// Navigate to another page in a directory that is the sibling of the base.
@@ -71,7 +72,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-2.html",
 				report: "navigate to another page within the same non-base directory hierarchy"
 			} );
@@ -84,7 +85,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 			// Verify that we are on the expected page.
 			// the hash based nav result (hash:) is dictate by the fact that #internal-page-1
 			// is the original root page element
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: home,
 				report: "navigate from a page in a non-base directory to an internal page"
 			} );
@@ -95,7 +96,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: baseDir + "base-page-1.html",
 				report: "call changePage() with a filename (no path)"
 			} );
@@ -106,7 +107,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-1.html",
 				report: "call changePage() with a relative path containing up-level references"
 			} );
@@ -117,9 +118,10 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-2.html",
-				report: "call changePage() with a relative path should resolve relative to current page"
+				report: "call changePage() with a relative path should resolve relative to " +
+					"current page"
 			} );
 
 			// test that an internal page works
@@ -128,7 +130,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hash: "internal-page-2",
 				push: home + "#internal-page-2",
 				report: "call changePage() with a page id"
@@ -140,10 +142,11 @@ asyncTest( "can navigate between internal and external pages", function() {
 
 		function() {
 			// Verify that we are on the expected page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hash: "internal-page-2",
 				push: home + "#internal-page-2",
-				report: "calling changePage() with a page id that is not prefixed with '#' should not change page"
+				report: "calling changePage() with a page id that is not prefixed with '#' " +
+					"should not change page"
 			} );
 
 			// Previous load should have failed and left us on internal-page-2.
@@ -152,7 +155,7 @@ asyncTest( "can navigate between internal and external pages", function() {
 	] );
 } );
 
-asyncTest( "internal form with no action submits to document URL", function() {
+asyncTest( "internal form with no action submits to document URL", function( assert ) {
 	$.testHelper.pageSequence( [
 		// open our test page
 		function() {
@@ -164,7 +167,7 @@ asyncTest( "internal form with no action submits to document URL", function() {
 		},
 
 		function() {
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: location.pathname + "?foo=1&bar=2",
 				report: "hash should match document url and not base url"
 			} );
@@ -174,7 +177,7 @@ asyncTest( "internal form with no action submits to document URL", function() {
 	] );
 } );
 
-asyncTest( "external page form with no action submits to external page URL", function() {
+asyncTest( "external page form with no action submits to external page URL", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			// Go to an external page that has a form.
@@ -183,7 +186,7 @@ asyncTest( "external page form with no action submits to external page URL", fun
 
 		function() {
 			// Make sure we actually navigated to the external page.
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-1.html",
 				report: "should be on content-page-1.html"
 			} );
@@ -193,7 +196,7 @@ asyncTest( "external page form with no action submits to external page URL", fun
 		},
 
 		function() {
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: contentDir + "content-page-1.html?foo=1&bar=2",
 				report: "hash should match page url and not document url"
 			} );
diff --git a/tests/integration/navigation/navigation_core.js b/tests/integration/navigation/navigation_core.js
index 44b8878896f..72ce83b3b8f 100644
--- a/tests/integration/navigation/navigation_core.js
+++ b/tests/integration/navigation/navigation_core.js
@@ -1,8 +1,8 @@
+// Mobile navigation unit tests
+( function( QUnit, $ ) {
+
 $.testHelper.delayStart();
-/*
- * mobile navigation unit tests
- */
-( function( $ ) {
+
 // TODO move siteDirectory over to the nav path helper
 var changePageFn = $.mobile.changePage,
 	originalTitle = document.title,
@@ -16,7 +16,7 @@ navigateTestRoot = function() {
 	$.testHelper.openPage( "#" + location.pathname + location.search );
 };
 
-test( "Absolute link with hash works", function() {
+QUnit.test( "Absolute link with hash works", function( assert ) {
 	var defaultIsPrevented,
 		theLink = $( "#goToGoogle" ),
 		theClickHandler = function( event ) {
@@ -32,7 +32,7 @@ test( "Absolute link with hash works", function() {
 
 	$.mobile.document.off( "click", theClickHandler );
 
-	deepEqual( defaultIsPrevented, false,
+	assert.strictEqual( defaultIsPrevented, false,
 		"Default is not prevented when clicking on external link with hash" );
 } );
 
@@ -41,7 +41,7 @@ test( "Absolute link with hash works", function() {
 	var goUrl, originalGo,
 		navigatorPrototype = $.mobile.Navigator.prototype;
 
-	module( "Navigation encoding", {
+	QUnit.module( "Navigation encoding", {
 		setup: function() {
 			goUrl = undefined;
 			originalGo = navigatorPrototype.go;
@@ -56,7 +56,7 @@ test( "Absolute link with hash works", function() {
 		}
 	} );
 
-	asyncTest( "Going to a page requiring url encoding works", function() {
+	QUnit.asyncTest( "Going to a page requiring url encoding works", function( assert ) {
 		var endingString = $( "#goToPercentPage" ).attr( "href" );
 
 		$.testHelper.pageSequence( [
@@ -64,22 +64,22 @@ test( "Absolute link with hash works", function() {
 				$( "#goToPercentPage" ).click();
 			},
 			function() {
-				deepEqual( $.mobile.activePage.children( "#percentPageChild" ).length, 1,
+				strictEqual( $.mobile.activePage.children( "#percentPageChild" ).length, 1,
 					"Active page is the one loaded from the directory with a percent symbol" );
 
-				deepEqual(
+				strictEqual(
 					goUrl.lastIndexOf( endingString ),
 					goUrl.length - endingString.length,
 					"Location ends in '" + endingString + "'" );
 				$.mobile.back();
 			},
-			start
+			QUnit.start
 		] );
 	} );
 
 } )();
 
-module( 'jquery.mobile.navigation.js', {
+QUnit.module( "jquery.mobile.navigation.js", {
 	setup: function() {
 		$.mobile.navigate.history.stack = [];
 		$.mobile.navigate.history.activeIndex = 0;
@@ -94,313 +94,343 @@ module( 'jquery.mobile.navigation.js', {
 	}
 } );
 
-asyncTest( "window.history.back() from external to internal page", function() {
+QUnit.asyncTest( "window.history.back() from external to internal page", function( assert ) {
 	$.testHelper.pageSequence( [
-		// open our test page
+
+		// Open our test page
 		function() {
 			$.testHelper.openPage( "#active-state-page1" );
 		},
 
 		function() {
-			ok( $.mobile.activePage[ 0 ] === $( "#active-state-page1" )[ 0 ], "successful navigation to internal page." );
+			assert.ok( $.mobile.activePage[ 0 ] === $( "#active-state-page1" )[ 0 ],
+				"successful navigation to internal page." );
 
-			$.testHelper.openPage( "#" + $.mobile.path.parseLocation().directory + "external.html" );
+			$.testHelper.openPage( "#" + $.mobile.path.parseLocation().directory +
+				"external.html" );
 		},
 
 		function() {
-			deepEqual( $.mobile.activePage.attr( "id" ), "external-test", "successful navigation to external page." );
+			assert.strictEqual( $.mobile.activePage.attr( "id" ), "external-test",
+				"successful navigation to external page." );
 			window.history.back();
 		},
 
 		function() {
-			ok( $.mobile.activePage[ 0 ] === $( "#active-state-page1" )[ 0 ], "successful navigation back to internal page." );
-			start();
+			assert.ok( $.mobile.activePage[ 0 ] === $( "#active-state-page1" )[ 0 ],
+				"successful navigation back to internal page." );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "external empty page does not result in any contents", function() {
+QUnit.asyncTest( "external empty page does not result in any contents", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "blank.html" );
 		},
 
 		function() {
-			deepEqual( $.mobile.activePage.contents().length, 0, "A blank page has no contents" );
+			assert.strictEqual( $.mobile.activePage.contents().length, 0,
+				"A blank page has no contents" );
 			$.mobile.back();
 		},
 
 		function() {
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "external page is removed from the DOM after pagehide", function() {
+QUnit.asyncTest( "external page is removed from the DOM after pagehide", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "external.html" );
 		},
 
-		// page is pulled and displayed in the dom
+		// Page is pulled and displayed in the dom
 		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
+			assert.strictEqual( $( "#external-test" ).length, 1 );
 			window.history.back();
 		},
 
 		// external-test is *NOT* cached in the dom after transitioning away
 		function( timedOut ) {
-			deepEqual( $( "#external-test" ).length, 0 );
-			start();
+			assert.strictEqual( $( "#external-test" ).length, 0 );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "preventDefault on pageremove event can prevent external page from being removed from the DOM", function() {
-	var preventRemoval = true,
-		removeCallback = function( e ) {
-			if ( preventRemoval ) {
-				e.preventDefault();
-			}
-		};
+QUnit.asyncTest( "preventDefault on pageremove prevents external page from being removed",
+	function( assert ) {
+		var preventRemoval = true,
+			removeCallback = function( e ) {
+				if ( preventRemoval ) {
+					e.preventDefault();
+				}
+			};
 
-	$( document ).bind( "pageremove", removeCallback );
+		$( document ).bind( "pageremove", removeCallback );
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.changePage( "external.html" );
-		},
+		$.testHelper.pageSequence( [
+			function() {
+				$.mobile.changePage( "external.html" );
+			},
 
-		// page is pulled and displayed in the dom
-		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
-			window.history.back();
-		},
+			// Page is pulled and displayed in the dom
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 1 );
+				window.history.back();
+			},
 
-		// external-test *IS* cached in the dom after transitioning away
-		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
+			// external-test *IS* cached in the dom after transitioning away
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 1 );
 
-			// Switch back to the page again!
-			$.mobile.changePage( "external.html" );
-		},
+				// Switch back to the page again!
+				$.mobile.changePage( "external.html" );
+			},
 
-		// page is still present and displayed in the dom
-		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
+			// Page is still present and displayed in the dom
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 1 );
 
-			// Now turn off our removal prevention.
-			preventRemoval = false;
+				// Now turn off our removal prevention.
+				preventRemoval = false;
 
-			window.history.back();
-		},
+				window.history.back();
+			},
 
-		// external-test is *NOT* cached in the dom after transitioning away
-		function() {
-			deepEqual( $( "#external-test" ).length, 0, "#external-test is gone" );
-			$( document ).unbind( "pageremove", removeCallback );
-			start();
-		}
-	] );
-} );
+			// external-test is *NOT* cached in the dom after transitioning away
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 0, "#external-test is gone" );
+				$( document ).unbind( "pageremove", removeCallback );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "external page is cached in the DOM after pagehide", function() {
+QUnit.asyncTest( "external page is cached in the DOM after pagehide", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "cached-external.html" );
 		},
 
-		// page is pulled and displayed in the dom
+		// Page is pulled and displayed in the dom
 		function() {
-			deepEqual( $( "#external-test-cached" ).length, 1 );
+			assert.strictEqual( $( "#external-test-cached" ).length, 1 );
 			window.history.back();
 		},
 
-		// external test page is cached in the dom after transitioning away
+		// External test page is cached in the dom after transitioning away
 		function() {
-			deepEqual( $( "#external-test-cached" ).length, 1 );
-			start();
+			assert.strictEqual( $( "#external-test-cached" ).length, 1 );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "external page is cached in the DOM after pagehide when option is set globally", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.page.prototype.options.domCache = true;
-			$.mobile.changePage( "external.html" );
-		},
-
-		// page is pulled and displayed in the dom
-		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
-			window.history.back();
-		},
+QUnit.asyncTest( "external page is cached after pagehide when option is set globally",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.mobile.page.prototype.options.domCache = true;
+				$.mobile.changePage( "external.html" );
+			},
 
-		// external test page is cached in the dom after transitioning away
-		function() {
-			deepEqual( $( "#external-test" ).length, 1 );
-			$.mobile.page.prototype.options.domCache = false;
-			$( "#external-test" ).remove();
-			start();
-		} ] );
-} );
+			// Page is pulled and displayed in the dom
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 1 );
+				window.history.back();
+			},
 
-asyncTest( "page last scroll distance is remembered while navigating to and from pages", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$( "body" ).height( $( window ).height() + 500 );
-			$.mobile.changePage( "external.html" );
-		},
+			// External test page is cached in the dom after transitioning away
+			function() {
+				assert.strictEqual( $( "#external-test" ).length, 1 );
+				$.mobile.page.prototype.options.domCache = false;
+				$( "#external-test" ).remove();
+				QUnit.start();
+			} ] );
+	} );
 
-		function() {
-			// wait for the initial scroll to 0
-			setTimeout( function() {
-				window.scrollTo( 0, 300 );
-				deepEqual( $( window ).scrollTop(), 300, "scrollTop is 300 after setting it" );
-			}, 300 );
-
-			// wait for the scrollstop to fire and for the scroll to be
-			// recorded 100 ms afterward (see changes made to handle hash
-			// scrolling in some browsers)
-			setTimeout( navigateTestRoot, 500 );
-		},
+QUnit.asyncTest( "page last scroll distance is remembered when navigating to/from pages",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$( "body" ).height( $( window ).height() + 500 );
+				$.mobile.changePage( "external.html" );
+			},
 
-		function() {
-			history.back();
-		},
+			function() {
 
-		function() {
-			// Give the silentScroll function some time to kick in.
-			setTimeout( function() {
-				deepEqual( $( window ).scrollTop(), 300, "scrollTop is 300 after returning to the page" );
-				$( "body" ).height( "" );
-				start();
-			}, 300 );
-		}
-	] );
-} );
+				// Wait for the initial scroll to 0
+				setTimeout( function() {
+					window.scrollTo( 0, 300 );
+					assert.strictEqual( $( window ).scrollTop(), 300,
+						"scrollTop is 300 after setting it" );
+				}, 300 );
 
-asyncTest( "forms with data attribute ajax set to false will not call changePage", function() {
-	var called = false;
-	var newChangePage = function() {
-		called = true;
-	};
+				// Wait for the scrollstop to fire and for the scroll to be recorded 100 ms
+				// afterward (see changes made to handle hash scrolling in some browsers)
+				setTimeout( navigateTestRoot, 500 );
+			},
 
-	$.testHelper.sequence( [
-		// avoid initial page load triggering changePage early
-		function() {
-			$.mobile.changePage = newChangePage;
+			function() {
+				history.back();
+			},
 
-			$( '#non-ajax-form' ).one( 'submit', function( event ) {
-				ok( true, 'submit callbacks are fired' );
-				event.preventDefault();
-			} ).submit();
-		},
+			function() {
 
-		function() {
-			ok( !called, "change page should not be called" );
-			start();
-		} ], 1000 );
-} );
+				// Give the silentScroll function some time to kick in.
+				setTimeout( function() {
+					assert.strictEqual( $( window ).scrollTop(), 300,
+						"scrollTop is 300 after returning to the page" );
+					$( "body" ).height( "" );
+					QUnit.start();
+				}, 300 );
+			}
+		] );
+	} );
 
-asyncTest( "forms with data attribute ajax not set or set to anything but false will call changePage", function() {
-	var called = 0,
-		newChangePage = function() {
-			called++;
+QUnit.asyncTest( "forms with data attribute ajax set to false will not call changePage",
+	function( assert ) {
+		var called = false;
+		var newChangePage = function() {
+			called = true;
 		};
 
-	$.testHelper.sequence( [
-		// avoid initial page load triggering changePage early
-		function() {
-			$.mobile.changePage = newChangePage;
-			$( '#ajax-form, #rand-ajax-form' ).submit();
-		},
-
-		function() {
-			ok( called >= 2, "change page should be called at least twice" );
-			start();
-		} ], 300 );
-} );
+		$.testHelper.sequence( [
 
+			// Avoid initial page load triggering changePage early
+			function() {
+				$.mobile.changePage = newChangePage;
 
-asyncTest( "anchors with no href attribute will do nothing when clicked", function() {
-	var fired = false;
+				$( "#non-ajax-form" ).one( "submit", function( event ) {
+					assert.ok( true, "submit callbacks are fired" );
+					event.preventDefault();
+				} ).submit();
+			},
 
-	$( window ).bind( "hashchange.temp", function() {
-		fired = true;
+			function() {
+				assert.ok( !called, "change page should not be called" );
+				QUnit.start();
+			} ], 1000 );
 	} );
 
-	$( "<a>test</a>" ).appendTo( $.mobile.firstPage ).click();
+QUnit.asyncTest(
+	"forms with ajax attribute absent or set to anything but false will call changePage",
+	function( assert ) {
+		var called = 0,
+			newChangePage = function() {
+				called++;
+			};
+
+		$.testHelper.sequence( [
 
-	setTimeout( function() {
-		deepEqual( fired, false, "hash shouldn't change after click" );
-		$( window ).unbind( "hashchange.temp" );
-		start();
-	}, 500 );
-} );
+			// Avoid initial page load triggering changePage early
+			function() {
+				$.mobile.changePage = newChangePage;
+				$( "#ajax-form, #rand-ajax-form" ).submit();
+			},
+
+			function() {
+				assert.ok( called >= 2, "change page should be called at least twice" );
+				QUnit.start();
+			} ], 300 );
+	} );
+;
+QUnit.asyncTest( "anchors with no href attribute will do nothing when clicked",
+	function( assert ) {
+		var fired = false;
+
+		$( window ).bind( "hashchange.temp", function() {
+			fired = true;
+		} );
+
+		$( "<a>test</a>" ).appendTo( $.mobile.firstPage ).click();
+
+		setTimeout( function() {
+			assert.strictEqual( fired, false, "hash shouldn't change after click" );
+			$( window ).unbind( "hashchange.temp" );
+			QUnit.start();
+		}, 500 );
+	} );
 
-test( "urlHistory is working properly", function() {
+QUnit.test( "urlHistory is working properly", function( assert ) {
 
-	//urlHistory
-	deepEqual( $.type( $.mobile.navigate.history.stack ), "array", "urlHistory.stack is an array" );
+	// urlHistory
+	assert.strictEqual( $.type( $.mobile.navigate.history.stack ), "array",
+		"urlHistory.stack is an array" );
 
-	//preload the stack
+	// Preload the stack
 	$.mobile.navigate.history.stack[ 0 ] = { url: "foo", transition: "bar" };
 	$.mobile.navigate.history.stack[ 1 ] = { url: "baz", transition: "shizam" };
 	$.mobile.navigate.history.stack[ 2 ] = { url: "shizoo", transition: "shizaah" };
 
-	//active index
-	deepEqual( $.mobile.navigate.history.activeIndex, 0, "urlHistory.activeIndex is 0" );
+	// Active index
+	assert.strictEqual( $.mobile.navigate.history.activeIndex, 0, "urlHistory.activeIndex is 0" );
 
-	//getActive
-	deepEqual( $.type( $.mobile.navigate.history.getActive() ), "object", "active item is an object" );
-	deepEqual( $.mobile.navigate.history.getActive().url, "foo", "active item has url foo" );
-	deepEqual( $.mobile.navigate.history.getActive().transition, "bar", "active item has transition bar" );
+	// getActive
+	assert.strictEqual( $.type( $.mobile.navigate.history.getActive() ), "object",
+		"active item is an object" );
+	assert.strictEqual( $.mobile.navigate.history.getActive().url, "foo",
+		"active item has url foo" );
+	assert.strictEqual( $.mobile.navigate.history.getActive().transition, "bar",
+		"active item has transition bar" );
 
-	//get prev / next
-	deepEqual( $.mobile.navigate.history.getPrev(), undefined, "urlHistory.getPrev() is undefined when active index is 0" );
+	// Get prev / next
+	assert.strictEqual( $.mobile.navigate.history.getPrev(), undefined,
+		"urlHistory.getPrev() is undefined when active index is 0" );
 	$.mobile.navigate.history.activeIndex = 1;
-	deepEqual( $.mobile.navigate.history.getPrev().url, "foo", "urlHistory.getPrev() has url foo when active index is 1" );
+	assert.strictEqual( $.mobile.navigate.history.getPrev().url, "foo",
+		"urlHistory.getPrev() has url foo when active index is 1" );
 	$.mobile.navigate.history.activeIndex = 0;
-	deepEqual( $.mobile.navigate.history.getNext().url, "baz", "urlHistory.getNext() has url baz when active index is 0" );
+	assert.strictEqual( $.mobile.navigate.history.getNext().url, "baz",
+		"urlHistory.getNext() has url baz when active index is 0" );
 
-	//add new
+	// Add new
 	$.mobile.navigate.history.activeIndex = 2;
 	$.mobile.navigate.history.add( "test" );
-	deepEqual( $.mobile.navigate.history.stack.length, 4, "urlHistory.addNew() adds an item after the active index" );
-	deepEqual( $.mobile.navigate.history.activeIndex, 3, "urlHistory.addNew() moves the activeIndex to the newly added item" );
+	assert.strictEqual( $.mobile.navigate.history.stack.length, 4,
+		"urlHistory.addNew() adds an item after the active index" );
+	assert.strictEqual( $.mobile.navigate.history.activeIndex, 3,
+		"urlHistory.addNew() moves the activeIndex to the newly added item" );
 
-	//clearForward
+	// clearForward
 	$.mobile.navigate.history.activeIndex = 0;
 	$.mobile.navigate.history.clearForward();
-	deepEqual( $.mobile.navigate.history.stack.length, 1, "urlHistory.clearForward() clears the url stack after the active index" );
+	assert.strictEqual( $.mobile.navigate.history.stack.length, 1,
+		"urlHistory.clearForward() clears the url stack after the active index" );
 } );
 
-//url listening
-function testListening( prop ) {
+// Url listening
+function testListening( assert, prop ) {
 	var stillListening = false;
 	$( document ).bind( "pagebeforehide", function() {
 		stillListening = true;
 	} );
 	location.hash = "foozball";
 	setTimeout( function() {
-		ok( prop == stillListening, prop + " = false disables default hashchange event handler" );
+		assert.ok( prop == stillListening,
+			prop + " = false disables default hashchange event handler" );
 		location.hash = "";
 		prop = true;
-		start();
+		QUnit.start();
 	}, 1000 );
 }
 
-asyncTest( "ability to disable our hash change event listening internally", function() {
-	testListening( !$.mobile.navigate.history.ignoreNextHashChange );
-} );
+QUnit.asyncTest( "ability to disable our hash change event listening internally",
+	function( assert ) {
+		testListening( assert, !$.mobile.navigate.history.ignoreNextHashChange );
+	} );
 
-asyncTest( "ability to disable our hash change event listening globally", function() {
-	testListening( $.mobile.hashListeningEnabled );
-} );
+QUnit.asyncTest( "ability to disable our hash change event listening globally",
+	function( assert ) {
+		testListening( assert, $.mobile.hashListeningEnabled );
+	} );
 
-var testDataUrlHash = function( linkSelector, matches ) {
+var testDataUrlHash = function( assert, linkSelector, matches ) {
 	$.testHelper.pageSequence( [
 		function() {
 			window.location.hash = "";
@@ -409,574 +439,640 @@ var testDataUrlHash = function( linkSelector, matches ) {
 			$( linkSelector ).click();
 		},
 		function() {
-			$.testHelper.assertUrlLocation(
+			$.testHelper.assertUrlLocation( assert,
 				$.extend( matches, {
 					report: "url or hash should match"
 				} )
 			);
 
-			start();
+			QUnit.start();
 		}
 	] );
 
-	stop();
+	QUnit.stop();
 };
 
-test( "when loading a page where data-url is not defined on a sub element hash defaults to the url", function() {
-	testDataUrlHash( "#non-data-url a", { hashOrPush: siteDirectory + "data-url-tests/non-data-url.html" } );
-} );
+QUnit.test(
+	"when loading a page where data-url is not defined on a subelement hash defaults to the url",
+	function( assert ) {
+		testDataUrlHash( assert, "#non-data-url a", {
+			hashOrPush: siteDirectory + "data-url-tests/non-data-url.html"
+		} );
+	} );
 
-test( "data url works for nested paths", function() {
+QUnit.test( "data url works for nested paths", function( assert ) {
 	var url = "foo/bar.html";
-	testDataUrlHash( "#nested-data-url a", { hashOrPush: home + url } );
+	testDataUrlHash( assert, "#nested-data-url a", { hashOrPush: home + url } );
 } );
 
-test( "data url works for single quoted paths and roles", function() {
+QUnit.test( "data url works for single quoted paths and roles", function( assert ) {
 	var url = "foo/bar/single.html";
-	testDataUrlHash( "#single-quotes-data-url a", { hashOrPush: home + url } );
+	testDataUrlHash( assert, "#single-quotes-data-url a", { hashOrPush: home + url } );
 } );
 
-test( "data url works when role and url are reversed on the page element", function() {
-	var url = "foo/bar/reverse.html";
-	testDataUrlHash( "#reverse-attr-data-url a", { hashOrPush: home + url } );
-} );
+QUnit.test( "data url works when role and url are reversed on the page element",
+	function( assert ) {
+		var url = "foo/bar/reverse.html";
+		testDataUrlHash( assert, "#reverse-attr-data-url a", { hashOrPush: home + url } );
+	} );
 
-asyncTest( "last entry chosen amongst multiple identical url history stack entries on hash change", function() {
-	var stackLength = $.mobile.navigate.history.stack.length;
+QUnit.asyncTest(
+	"last entry chosen amongst multiple identical url history stack entries on hash change",
+	function( assert ) {
+		var stackLength = $.mobile.navigate.history.stack.length;
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#dup-history-first" );
-		},
-		function() {
-			$( "#dup-history-first a" ).click();
-		},
-		function() {
-			$( "#dup-history-second a:first" ).click();
-		},
-		function() {
-			$( "#dup-history-first a" ).click();
-		},
-		function() {
-			$( "#dup-history-second a:last" ).click();
-		},
-		function() {
-			$( "#dup-history-dialog a:contains('Close')" ).click();
-		},
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#dup-history-first" );
+			},
+			function() {
+				$( "#dup-history-first a" ).click();
+			},
+			function() {
+				$( "#dup-history-second a:first" ).click();
+			},
+			function() {
+				$( "#dup-history-first a" ).click();
+			},
+			function() {
+				$( "#dup-history-second a:last" ).click();
+			},
+			function() {
+				$( "#dup-history-dialog a:contains('Close')" ).click();
+			},
 
-		function() {
-			// it should be the third page after whatever is in the stack to start with
-			// [wherever this test starts] -> #dup-history-first -> #dup-history-second -> #dup-history-first -> #dup-history-second -> dialog --close/back button--> [first #dup-history-second-entry]
-			deepEqual( $.mobile.navigate.history.activeIndex, 3 + stackLength, "should be the fourth page in the stack" );
-			start();
-		} ] );
-} );
+			function() {
 
-asyncTest( "going back from a page entered from a dialog skips the dialog and goes to the previous page", function() {
-	$.testHelper.pageSequence( [
-		// setup
-		function() {
-			$.mobile.changePage( "#skip-dialog-first" );
-		},
+				// It should be the third page after whatever is in the stack to start with
+				// [wherever this test starts] -> #dup-history-first -> #dup-history-second ->
+				// #dup-history-first -> #dup-history-second -> dialog --close/back button-->
+				// [first #dup-history-second-entry]
+				assert.strictEqual( $.mobile.navigate.history.activeIndex, 3 + stackLength,
+					"should be the fourth page in the stack" );
+				QUnit.start();
+			} ] );
+	} );
 
-		// transition to the dialog
-		function() {
-			$( "#skip-dialog-first a" ).click();
-		},
+QUnit.asyncTest(
+	"going back from a page entered from a dialog skips past the dialog to the prev page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		// transition to the second page
-		function() {
-			$( "#skip-dialog a" ).click();
-		},
+			// Setup
+			function() {
+				$.mobile.changePage( "#skip-dialog-first" );
+			},
 
-		// transition past the dialog via data-rel=back link on the second page
-		function() {
-			$( "#skip-dialog-second a" ).click();
-		},
+			// Transition to the dialog
+			function() {
+				$( "#skip-dialog-first a" ).click();
+			},
 
-		// make sure we're at the first page and not the dialog
-		function() {
-			$.testHelper.assertUrlLocation( {
-				hash: "skip-dialog-first",
-				push: homeWithSearch + "#skip-dialog-first",
-				report: "should be the first page in the sequence"
-			} );
+			// Transition to the second page
+			function() {
+				$( "#skip-dialog a" ).click();
+			},
 
-			start();
-		}
-	] );
-} );
+			// Transition past the dialog via data-rel=back link on the second page
+			function() {
+				$( "#skip-dialog-second a" ).click();
+			},
 
-asyncTest( "going forward from a page entered from a dialog skips the dialog and goes to the next page", function() {
-	$.testHelper.pageSequence( [
-		// setup
-		function() {
-			$.testHelper.openPage( "#skip-dialog-first" );
-		},
+			// Make sure we're at the first page and not the dialog
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+					hash: "skip-dialog-first",
+					push: homeWithSearch + "#skip-dialog-first",
+					report: "should be the first page in the sequence"
+				} );
 
-		// transition to the dialog
-		function() {
-			$( "#skip-dialog-first a" ).click();
-		},
+				QUnit.start();
+			}
+		] );
+	} );
 
-		// transition to the second page
-		function() {
-			$( "#skip-dialog a" ).click();
-		},
+QUnit.asyncTest( "going forward from a page entered from a dialog skips the dialog and goes to " +
+	"the next page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		// transition to back past the dialog
-		function() {
-			window.history.back();
-		},
+			// Setup
+			function() {
+				$.testHelper.openPage( "#skip-dialog-first" );
+			},
 
-		// transition to the second page past the dialog through history
-		function() {
-			window.history.forward();
-		},
+			// Transition to the dialog
+			function() {
+				$( "#skip-dialog-first a" ).click();
+			},
 
-		// make sure we're on the second page and not the dialog
-		function() {
-			$.testHelper.assertUrlLocation( {
-				hash: "skip-dialog-second",
-				push: homeWithSearch + "#skip-dialog-second",
-				report: "should be the second page after the dialog"
-			} );
+			// Transition to the second page
+			function() {
+				$( "#skip-dialog a" ).click();
+			},
 
-			start();
-		} ] );
-} );
+			// Transition to back past the dialog
+			function() {
+				window.history.back();
+			},
 
-asyncTest( "going back from a stale dialog history entry does not cause the base tag to be reset", function() {
-	var baseHRef;
+			// Transition to the second page past the dialog through history
+			function() {
+				window.history.forward();
+			},
 
-	expect( 1 );
+			// Make sure we're on the second page and not the dialog
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+					hash: "skip-dialog-second",
+					push: homeWithSearch + "#skip-dialog-second",
+					report: "should be the second page after the dialog"
+				} );
+
+				QUnit.start();
+			} ] );
+	} );
 
-	$.testHelper.pageSequence( [
-		// setup
-		function() {
-			$.testHelper.openPage( "#dialog-base-tag-test-page" );
-		},
+QUnit.asyncTest(
+	"going back from a stale dialog history entry does not cause the base tag to be reset",
+	function( assert ) {
+		var baseHRef;
 
-		// go to page that launches dialog
-		function() {
-			$( "#dialog-base-tag-test-page a" ).click();
-		},
+		expect( 1 );
 
-		// record the base href and launch the dialog
-		function( timedOut ) {
-			baseHRef = $( "base" ).attr( "href" );
-			$( "a#go-to-dialog" ).click();
-		},
+		$.testHelper.pageSequence( [
 
-		// close the dialog - this assumes a close button link will be added to the dialog as part of the enhancement process
-		function( timedOut ) {
-			$( "#dialog-base-tag-test a" ).click();
-		},
+			// Setup
+			function() {
+				$.testHelper.openPage( "#dialog-base-tag-test-page" );
+			},
 
-		function( timedOut ) {
-			// $.testHelper.pageSequence cannot be used here because no page changes occur
-			$.testHelper.sequence( [
-				// Go forward to reach the now-stale dialogHashKey history entry
-				function() {
-					window.history.forward();
-				},
-
-				// Go back
-				function() {
-					window.history.back();
-				},
-
-				// Make sure the base href is unchanged from the recorded value, and back up to the start page
-				function() {
-					deepEqual( $( "base" ).attr( "href" ), baseHRef, "href of base tag is unchanged" );
-
-					// Return to start page
-					$.testHelper.pageSequence( [
-						// Go back to the setup page
-						function() {
-							window.history.back();
-						},
-
-						// Go back to the start page
-						function() {
-							window.history.back();
-						},
-
-						// Conclude the test
-						function() {
-							start();
-						}
-					] );
-				}
-			], 2000 );
-		}
-	] );
-} );
+			// Go to page that launches dialog
+			function() {
+				$( "#dialog-base-tag-test-page a" ).click();
+			},
 
-asyncTest( "opening a dialog, closing it, moving forward, and opening it again, does not result in a dialog that needs to be closed twice", function() {
-	$.testHelper.pageSequence( [
-		// setup
-		function() {
-			$.testHelper.openPage( "#dialog-double-hash-test" );
-		},
+			// Record the base href and launch the dialog
+			function( timedOut ) {
+				baseHRef = $( "base" ).attr( "href" );
+				$( "a#go-to-dialog" ).click();
+			},
 
-		// transition to the dialog
-		function() {
-			$( "#dialog-double-hash-test a" ).click();
-		},
+			// Close the dialog - this assumes a close button link will be added to the dialog as
+			// part of the enhancement process
+			function( timedOut ) {
+				$( "#dialog-base-tag-test a" ).click();
+			},
 
-		// close the dialog
-		function() {
-			$( "#dialog-double-hash-test-dialog a" ).click();
-		},
+			function( timedOut ) {
+
+				// $.testHelper.pageSequence cannot be used here because no page changes occur
+				$.testHelper.sequence( [
+
+					// Go forward to reach the now-stale dialogHashKey history entry
+					function() {
+						window.history.forward();
+					},
+
+					// Go back
+					function() {
+						window.history.back();
+					},
+
+					// Make sure the base href is unchanged from the recorded value, and back up to
+					// the start page
+					function() {
+						assert.strictEqual( $( "base" ).attr( "href" ), baseHRef,
+							"href of base tag is unchanged" );
+
+						// Return to start page
+						$.testHelper.pageSequence( [
+
+							// Go back to the setup page
+							function() {
+								window.history.back();
+							},
+
+							// Go back to the start page
+							function() {
+								window.history.back();
+							},
+
+							// Conclude the test
+							function() {
+								QUnit.start();
+							}
+						] );
+					}
+				], 2000 );
+			}
+		] );
+	} );
 
-		// Go forward
-		function() {
-			window.history.forward();
-		},
+QUnit.asyncTest( "opening a dialog, closing it, moving forward, and opening it again, does not " +
+	"result in a dialog that needs to be closed twice",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		// transition to the dialog
-		function() {
-			$( "#dialog-double-hash-test a" ).click();
-		},
+			// Setup
+			function() {
+				$.testHelper.openPage( "#dialog-double-hash-test" );
+			},
 
-		// close the dialog
-		function() {
-			$( "#dialog-double-hash-test-dialog a" ).click();
-		},
+			// Transition to the dialog
+			function() {
+				$( "#dialog-double-hash-test a" ).click();
+			},
 
-		// make sure the dialog is closed
-		function() {
-			setTimeout( function() {
-				deepEqual( $( "#dialog-double-hash-test" )[ 0 ], $.mobile.activePage[ 0 ], "should be back to the test page" );
-				start();
-			}, 800 );
-		}
-	] );
-} );
+			// Close the dialog
+			function() {
+				$( "#dialog-double-hash-test-dialog a" ).click();
+			},
 
-asyncTest( "going back from a dialog triggered from a dialog should result in the first dialog ", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#nested-dialog-page" );
-		},
+			// Go forward
+			function() {
+				window.history.forward();
+			},
 
-		// transition to the dialog
-		function() {
-			$( "#nested-dialog-page a" ).click();
-		},
+			// Transition to the dialog
+			function() {
+				$( "#dialog-double-hash-test a" ).click();
+			},
 
-		// transition to the second dialog
-		function() {
-			$( "#nested-dialog-first a" ).click();
-		},
+			// Close the dialog
+			function() {
+				$( "#dialog-double-hash-test-dialog a" ).click();
+			},
 
-		// transition to back to the first dialog
-		function() {
-			window.history.back();
-		},
+			// Make sure the dialog is closed
+			function() {
+				setTimeout( function() {
+					assert.deepEqual( $( "#dialog-double-hash-test" )[ 0 ],
+						$.mobile.activePage[ 0 ], "should be back to the test page" );
+					QUnit.start();
+				}, 800 );
+			}
+		] );
+	} );
 
-		// make sure we're on first dialog
-		function() {
-			deepEqual( $( ".ui-page-active" )[ 0 ], $( "#nested-dialog-first" )[ 0 ], "should be the first dialog" );
-			start();
-		} ] );
-} );
+QUnit.asyncTest( "going back from a dialog triggered from a dialog should result in the first " +
+	"dialog",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#nested-dialog-page" );
+			},
+
+			// Transition to the dialog
+			function() {
+				$( "#nested-dialog-page a" ).click();
+			},
+
+			// Transition to the second dialog
+			function() {
+				$( "#nested-dialog-first a" ).click();
+			},
+
+			// Transition to back to the first dialog
+			function() {
+				window.history.back();
+			},
+
+			// Make sure we're on first dialog
+			function() {
+				assert.deepEqual( $( ".ui-page-active" )[ 0 ], $( "#nested-dialog-first" )[ 0 ],
+					"should be the first dialog" );
+				QUnit.start();
+			} ] );
+	} );
 
-asyncTest( "loading a relative file path after an embedded page works", function() {
+QUnit.asyncTest( "loading a relative file path after an embedded page works", function( assert ) {
 	$.testHelper.pageSequence( [
-		// transition second page
+
+		// Transition second page
 		function() {
 			$.testHelper.openPage( "#relative-after-embedded-page-first" );
 		},
 
-		// transition second page
+		// Transition second page
 		function() {
 			$( "#relative-after-embedded-page-first a" ).click();
 		},
 
-		// transition to the relative ajax loaded page
+		// Transition to the relative ajax loaded page
 		function() {
 			$( "#relative-after-embedded-page-second a" ).click();
 		},
 
-		// make sure the page was loaded properly via ajax
+		// Make sure the page was loaded properly via ajax
 		function() {
-			// data attribute intentionally left without namespace
-			deepEqual( $( ".ui-page-active" ).data( "other" ), "for testing", "should be relative ajax loaded page" );
-			start();
+
+			// Data attribute intentionally left without namespace
+			assert.strictEqual( $( ".ui-page-active" ).data( "other" ), "for testing",
+				"should be relative ajax loaded page" );
+			QUnit.start();
 		} ] );
 } );
 
-asyncTest( "Page title updates properly when clicking back to previous page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#relative-after-embedded-page-first" );
-		},
+QUnit.asyncTest( "Page title updates properly when clicking back to previous page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#relative-after-embedded-page-first" );
+			},
 
-		function() {
-			window.history.back();
-		},
+			function() {
+				window.history.back();
+			},
 
-		function() {
-			deepEqual( document.title, "jQuery Mobile Navigation Test Suite" );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.strictEqual( document.title, "jQuery Mobile Navigation Test Suite" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "Page title updates properly when clicking a link back to first page", function() {
-	var title = document.title;
+QUnit.asyncTest( "Page title updates properly when clicking a link back to first page",
+	function( assert ) {
+		var title = document.title;
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#ajax-title-page" );
-		},
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#ajax-title-page" );
+			},
 
-		function() {
-			$( "#titletest1" ).click();
-		},
+			function() {
+				$( "#titletest1" ).click();
+			},
 
-		function() {
-			deepEqual( document.title, "Title Tag" );
-			$.mobile.activePage.find( "#title-check-link" ).click();
-		},
+			function() {
+				assert.strictEqual( document.title, "Title Tag" );
+				$.mobile.activePage.find( "#title-check-link" ).click();
+			},
 
-		function() {
-			deepEqual( document.title, title );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.strictEqual( document.title, title );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "Page title updates properly from title tag when loading an external page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#ajax-title-page" );
-		},
+QUnit.asyncTest( "Page title updates properly from title tag when loading an external page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#ajax-title-page" );
+			},
 
-		function() {
-			$( "#titletest1" ).click();
-		},
+			function() {
+				$( "#titletest1" ).click();
+			},
 
-		function() {
-			deepEqual( document.title, "Title Tag" );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.strictEqual( document.title, "Title Tag" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "Page title updates properly from data-title attr  when loading an external page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#ajax-title-page" );
-		},
+QUnit.asyncTest( "Page title updates properly from data-title attr  when loading an external page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#ajax-title-page" );
+			},
 
-		function() {
-			$( "#titletest2" ).click();
-		},
+			function() {
+				$( "#titletest2" ).click();
+			},
 
-		function() {
-			deepEqual( document.title, "Title Attr" );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.strictEqual( document.title, "Title Attr" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "Page title updates properly from heading text in header when loading an external page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#ajax-title-page" );
-		},
+QUnit.asyncTest( "Page title updates properly from heading text in header when loading an " +
+	"external page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#ajax-title-page" );
+			},
 
-		function() {
-			$( "#titletest3" ).click();
-		},
+			function() {
+				$( "#titletest3" ).click();
+			},
 
-		function() {
-			deepEqual( document.title, "Title Heading" );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.strictEqual( document.title, "Title Heading" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "Page links to the current active page result in the same active page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#self-link" );
-		},
+QUnit.asyncTest( "Page links to the current active page result in the same active page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#self-link" );
+			},
 
-		function() {
-			$( "a[href='#self-link']" ).click();
-		},
+			function() {
+				$( "a[href='#self-link']" ).click();
+			},
 
-		function() {
-			deepEqual( $.mobile.activePage[ 0 ], $( "#self-link" )[ 0 ], "self-link page is still the active page" );
-			start();
-		}
-	] );
-} );
+			function() {
+				assert.deepEqual( $.mobile.activePage[ 0 ], $( "#self-link" )[ 0 ],
+					"self-link page is still the active page" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "links on subdirectory pages with query params append the params and load the page", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#data-url-tests/non-data-url.html" );
-		},
+QUnit.asyncTest(
+	"links on subdirectory pages with query params append the params and load the page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#data-url-tests/non-data-url.html" );
+			},
 
-		function() {
-			$( "#query-param-anchor" ).click();
-		},
+			function() {
+				$( "#query-param-anchor" ).click();
+			},
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				// TODO note there's no guarantee that the query params will remain in this order
-				//      we should fix the comparison to take a callback and do something more complex
-				hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
-				report: "the hash or url has query params"
-			} );
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+
+					// TODO note there's no guarantee that the query params will remain in this
+					// order we should fix the comparison to take a callback and do something more
+					// complex
+					hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
+					report: "the hash or url has query params"
+				} );
+
+				assert.ok( $( ".ui-page-active" ).jqmData( "url" ).indexOf( "?foo=bar" ) > -1,
+					"the query params are in the data url" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-			ok( $( ".ui-page-active" ).jqmData( "url" ).indexOf( "?foo=bar" ) > -1, "the query params are in the data url" );
-			start();
-		}
-	] );
-} );
+QUnit.asyncTest( "identical query param link doesn't add additional set of query params",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#data-url-tests/non-data-url.html" );
+			},
 
-asyncTest( "identical query param link doesn't add additional set of query params", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#data-url-tests/non-data-url.html" );
-		},
+			function() {
+				$( "#query-param-anchor" ).click();
+			},
 
-		function() {
-			$( "#query-param-anchor" ).click();
-		},
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				// TODO note there's no guarantee that the query params will remain in this order
-				//      we should fix the comparison to take a callback and do something more complex
-				hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
-				report: "the hash or url has query params"
-			} );
+					// TODO note there's no guarantee that the query params will remain in this
+					//      order we should fix the comparison to take a callback and do something
+					//      more complex
+					hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
+					report: "the hash or url has query params"
+				} );
 
-			$( "#query-param-anchor" ).click();
-		},
+				$( "#query-param-anchor" ).click();
+			},
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				// TODO note there's no guarantee that the query params will remain in this order
-				//      we should fix the comparison to take a callback and do something more complex
-				hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
-				report: "the hash or url still has query params"
-			} );
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
 
-			start();
-		}
-	] );
-} );
+					// TODO note there's no guarantee that the query params will remain in this
+					//      order we should fix the comparison to take a callback and do something
+					//      more complex
+					hashOrPush: home + "data-url-tests/non-data-url.html?foo=bar",
+					report: "the hash or url still has query params"
+				} );
+
+				QUnit.start();
+			}
+		] );
+	} );
+
+// Special handling inside navigation because query params must be applied to the hash
+// or absolute reference and dialogs apply extra information int the hash that must be removed
+QUnit.asyncTest( "query param link from a dialog to itself should be a not add another dialog",
+	function( assert ) {
+		var firstDialogLoc;
+
+		$.testHelper.pageSequence( [
+
+			// Open our test page
+			function() {
+				$.testHelper.openPage( "#dialog-param-link" );
+			},
+
+			// Navigate to the subdirectory page with the query link
+			function() {
+				$( "#dialog-param-link a" ).click();
+			},
 
-// Special handling inside navigation because query params must be applied to the hash
-// or absolute reference and dialogs apply extra information int the hash that must be removed
-asyncTest( "query param link from a dialog to itself should be a not add another dialog", function() {
-	var firstDialogLoc;
+			// Navigate to the query param self reference link
+			function() {
+				$( "#dialog-param-link-page a" ).click();
+			},
 
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.testHelper.openPage( "#dialog-param-link" );
-		},
+			// Attempt to navigate to the same link
+			function() {
 
-		// navigate to the subdirectory page with the query link
-		function() {
-			$( "#dialog-param-link a" ).click();
-		},
+				// Store the current hash for comparison (with one dialog hash key)
+				firstDialogLoc = location.hash || location.href;
+				$( "#dialog-param-link-page a" ).click();
+			},
 
-		// navigate to the query param self reference link
-		function() {
-			$( "#dialog-param-link-page a" ).click();
-		},
+			function() {
+				assert.strictEqual( location.hash || location.href, firstDialogLoc,
+					"additional dialog hash key not added" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-		// attempt to navigate to the same link
-		function() {
-			// store the current hash for comparison (with one dialog hash key)
-			firstDialogLoc = location.hash || location.href;
-			$( "#dialog-param-link-page a" ).click();
-		},
+QUnit.asyncTest( "query data passed as a string to changePage is appended to URL",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		function() {
-			deepEqual( location.hash || location.href, firstDialogLoc, "additional dialog hash key not added" );
-			start();
-		}
-	] );
-} );
+			// Open our test page
+			function() {
+				$.mobile.changePage( "form-tests/changepage-data.html", {
+					data: "foo=1&bar=2"
+				} );
+			},
 
-asyncTest( "query data passed as a string to changePage is appended to URL", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.mobile.changePage( "form-tests/changepage-data.html", {
-				data: "foo=1&bar=2"
-			} );
-		},
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+					hashOrPush: home + "form-tests/changepage-data.html?foo=1&bar=2",
+					report: "the hash or url still has query params"
+				} );
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				hashOrPush: home + "form-tests/changepage-data.html?foo=1&bar=2",
-				report: "the hash or url still has query params"
-			} );
+				QUnit.start();
+			}
+		] );
+	} );
 
-			start();
-		}
-	] );
-} );
+QUnit.asyncTest( "query data passed as an object to changePage is appended to URL",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-asyncTest( "query data passed as an object to changePage is appended to URL", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.mobile.changePage( "form-tests/changepage-data.html", {
-				data: {
-					foo: 3,
-					bar: 4
-				}
-			} );
-		},
+			// Open our test page
+			function() {
+				$.mobile.changePage( "form-tests/changepage-data.html", {
+					data: {
+						foo: 3,
+						bar: 4
+					}
+				} );
+			},
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				hashOrPush: home + "form-tests/changepage-data.html?foo=3&bar=4",
-				report: "the hash or url still has query params"
-			} );
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+					hashOrPush: home + "form-tests/changepage-data.html?foo=3&bar=4",
+					report: "the hash or url still has query params"
+				} );
 
-			start();
-		}
-	] );
-} );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "refresh of a dialog url should not duplicate page", function() {
+QUnit.asyncTest( "refresh of a dialog url should not duplicate page", function( assert ) {
 	$.testHelper.pageSequence( [
-		// open our test page
+
+		// Open our test page
 		function() {
-			deepEqual( $( ".foo-class" ).length, 1, "should only have one instance of foo-class in the document" );
+			assert.strictEqual( $( ".foo-class" ).length, 1,
+				"should only have one instance of foo-class in the document" );
 			location.hash = "#foo&ui-state=dialog";
 		},
 
 		function() {
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hash: "foo&ui-state=dialog",
 				push: homeWithSearch + "#foo&ui-state=dialog",
 				report: "hash should match what was loaded"
 			} );
 
-			deepEqual( $( ".foo-class" ).length, 1, "should only have one instance of foo-class in the document" );
-			start();
+			assert.strictEqual( $( ".foo-class" ).length, 1,
+				"should only have one instance of foo-class in the document" );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "internal form with no action submits to document URL", function() {
+QUnit.asyncTest( "internal form with no action submits to document URL", function( assert ) {
 	$.testHelper.pageSequence( [
-		// open our test page
+
+		// Open our test page
 		function() {
 			$.testHelper.openPage( "#internal-no-action-form-page" );
 		},
@@ -986,46 +1082,49 @@ asyncTest( "internal form with no action submits to document URL", function() {
 		},
 
 		function() {
-			$.testHelper.assertUrlLocation( {
+			$.testHelper.assertUrlLocation( assert, {
 				hashOrPush: home + "?foo=1&bar=2",
 				report: "hash should match what was loaded"
 			} );
 
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "external page containing form with no action submits to page URL", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.testHelper.openPage( "#internal-no-action-form-page" );
-		},
+QUnit.asyncTest( "external page containing form with no action submits to page URL",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		function() {
-			$( "#internal-no-action-form-page a" ).eq( 0 ).click();
-		},
+			// Open our test page
+			function() {
+				$.testHelper.openPage( "#internal-no-action-form-page" );
+			},
 
-		function() {
-			$( "#external-form-no-action-page form" ).eq( 0 ).submit();
-		},
+			function() {
+				$( "#internal-no-action-form-page a" ).eq( 0 ).click();
+			},
 
-		function() {
-			$.testHelper.assertUrlLocation( {
-				hashOrPush: home + "form-tests/form-no-action.html?foo=1&bar=2",
-				report: "hash should match page url and not document url"
-			} );
+			function() {
+				$( "#external-form-no-action-page form" ).eq( 0 ).submit();
+			},
 
-			start();
-		}
-	] );
-} );
+			function() {
+				$.testHelper.assertUrlLocation( assert, {
+					hashOrPush: home + "form-tests/form-no-action.html?foo=1&bar=2",
+					report: "hash should match page url and not document url"
+				} );
+
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "handling of active button state when navigating", 1, function() {
+QUnit.asyncTest( "handling of active button state when navigating", 1, function( assert ) {
 
 	$.testHelper.pageSequence( [
-		// open our test page
+
+		// Open our test page
 		function() {
 			$.testHelper.openPage( "#active-state-page1" );
 		},
@@ -1039,46 +1138,49 @@ asyncTest( "handling of active button state when navigating", 1, function() {
 		},
 
 		function() {
-			ok( !$( "#active-state-page1 a" ).hasClass( "ui-button-active" ), "No button should not have class ui-button-active" );
-			start();
+			assert.lacksClasses( $( "#active-state-page1 a" ), "ui-button-active",
+				"No button should not have class " + $.mobile.activeBtnClass );
+			QUnit.start();
 		}
 	] );
 } );
 
-// issue 2444 https://github.com/jquery/jquery-mobile/issues/2444
-// results from preventing spurious hash changes
-asyncTest( "dialog should return to its parent page when open and closed multiple times", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.testHelper.openPage( "#default-trans-dialog" );
-		},
+// Issue 2444 https://github.com/jquery/jquery-mobile/issues/2444 results from preventing spurious
+// hash changes
+QUnit.asyncTest( "dialog should return to its parent page when opened and closed multiple times",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		function() {
-			$.mobile.activePage.find( "a" ).click();
-		},
+			// Open our test page
+			function() {
+				$.testHelper.openPage( "#default-trans-dialog" );
+			},
 
-		function() {
-			window.history.back();
-		},
+			function() {
+				$.mobile.activePage.find( "a" ).click();
+			},
 
-		function() {
-			deepEqual( $.mobile.activePage[ 0 ], $( "#default-trans-dialog" )[ 0 ] );
-			$.mobile.activePage.find( "a" ).click();
-		},
+			function() {
+				window.history.back();
+			},
 
-		function() {
-			window.history.back();
-		},
+			function() {
+				assert.deepEqual( $.mobile.activePage[ 0 ], $( "#default-trans-dialog" )[ 0 ] );
+				$.mobile.activePage.find( "a" ).click();
+			},
 
-		function() {
-			deepEqual( $.mobile.activePage[ 0 ], $( "#default-trans-dialog" )[ 0 ] );
-			start();
-		}
-	] );
-} );
+			function() {
+				window.history.back();
+			},
+
+			function() {
+				assert.deepEqual( $.mobile.activePage[ 0 ], $( "#default-trans-dialog" )[ 0 ] );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "clicks with middle mouse button are ignored", function() {
+QUnit.asyncTest( "clicks with middle mouse button are ignored", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.testHelper.openPage( "#odd-clicks-page" );
@@ -1088,13 +1190,13 @@ asyncTest( "clicks with middle mouse button are ignored", function() {
 			$( "#right-or-middle-click" ).click();
 		},
 
-		// make sure the page is opening first without the mocked button click value
-		// only necessary to prevent issues with test specific fixtures
+		// Make sure the page is opening first without the mocked button click value only necessary
+		// to prevent issues with test specific fixtures
 		function() {
-			deepEqual( $.mobile.activePage[ 0 ], $( "#odd-clicks-page-dest" )[ 0 ] );
+			assert.deepEqual( $.mobile.activePage[ 0 ], $( "#odd-clicks-page-dest" )[ 0 ] );
 			$.testHelper.openPage( "#odd-clicks-page" );
 
-			// mock the which value to simulate a middle click
+			// Mock the which value to simulate a middle click
 			$.Event.prototype.which = 2;
 		},
 
@@ -1103,167 +1205,200 @@ asyncTest( "clicks with middle mouse button are ignored", function() {
 		},
 
 		function( timeout ) {
-			ok( timeout, "page event handler timed out due to ignored click" );
-			ok( $.mobile.activePage[ 0 ] !== $( "#odd-clicks-page-dest" )[ 0 ], "pages are not the same" );
-			start();
+			assert.ok( timeout, "page event handler timed out due to ignored click" );
+			assert.ok( $.mobile.activePage[ 0 ] !== $( "#odd-clicks-page-dest" )[ 0 ],
+				"pages are not the same" );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "disabling link binding disables navigation via links and highlighting", function() {
-	$.mobile.linkBindingEnabled = false;
+QUnit.asyncTest( "disabling link binding disables nav via links and highlighting",
+	function( assert ) {
+		$.mobile.linkBindingEnabled = false;
 
-	$.testHelper.pageSequence( [
-		function() {
-			$.testHelper.openPage( "#bar" );
-		},
+		$.testHelper.pageSequence( [
+			function() {
+				$.testHelper.openPage( "#bar" );
+			},
 
-		function() {
-			$.mobile.activePage.find( "a" ).click();
-		},
+			function() {
+				$.mobile.activePage.find( "a" ).click();
+			},
 
-		function( timeout ) {
-			ok( !$.mobile.activePage.find( "a" ).hasClass( "ui-button-active" ), "vlick handler doesn't add the activebutton class" );
-			ok( timeout, "no page change was fired" );
-			start();
-		}
-	] );
-} );
+			function( timeout ) {
+				assert.lacksClasses( $.mobile.activePage.find( "a" ), "ui-button-active",
+					"vlick handler doesn't add the activebutton class" );
+				assert.ok( timeout, "no page change was fired" );
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "handling of button active state when navigating by clicking back button", 1, function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.testHelper.openPage( "#active-state-page1" );
-		},
+QUnit.asyncTest( "handling of button active state when back-button-navigating", 2,
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-		function() {
-			$( "#active-state-page1 a" ).eq( 0 ).click();
-		},
+			// Open our test page
+			function() {
+				$.testHelper.openPage( "#active-state-page1" );
+			},
 
-		function() {
-			$( "#active-state-page2 a" ).eq( 1 ).click();
-		},
+			function() {
+				$( "#active-state-page1 a" ).eq( 0 ).click();
+			},
 
-		function() {
-			$( "#active-state-page1 a" ).eq( 0 ).click();
-		},
+			function() {
+				$( "#active-state-page2 a" ).eq( 1 ).click();
+			},
 
-		function() {
-			ok( !$( "#active-state-page2 a" ).hasClass( "ui-button-active" ), "No button should not have class ui-button-active" );
-			start();
-		}
-	] );
-} );
+			function() {
+				$( "#active-state-page1 a" ).eq( 0 ).click();
+			},
 
-asyncTest( "can navigate to dynamically injected page with dynamically injected link", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			$.testHelper.openPage( "#inject-links-page" );
-		},
+			function() {
+				$( "#active-state-page2 a" ).each( function() {
+					assert.lacksClasses( this, "ui-button-active",
+						"No button should have class ui-button-active" );
+				} );
+				QUnit.start();
+			}
+		] );
+	} );
 
-		function() {
-			var $ilpage = $( "#inject-links-page" ),
-				$link = $( "<a href='#injected-test-page'>injected-test-page link</a>" );
+QUnit.asyncTest( "can navigate to dynamically injected page with dynamically injected link",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-			// Make sure we actually navigated to the expected page.
-			ok( $.mobile.activePage[ 0 ] == $ilpage[ 0 ], "navigated successfully to #inject-links-page" );
+			// Open our test page
+			function() {
+				$.testHelper.openPage( "#inject-links-page" );
+			},
 
-			// Now dynamically insert a page.
-			$ilpage.parent().append( "<div data-role='page' id='injected-test-page'>testing...</div>" );
+			function() {
+				var $ilpage = $( "#inject-links-page" ),
+					$link = $( "<a href='#injected-test-page'>injected-test-page link</a>" );
 
-			// Now inject a link to this page dynamically and attempt to navigate
-			// to the page we just inserted.
-			$link.appendTo( $ilpage ).click();
-		},
+				// Make sure we actually navigated to the expected page.
+				assert.ok( $.mobile.activePage[ 0 ] == $ilpage[ 0 ],
+					"navigated successfully to #inject-links-page" );
 
-		function() {
-			// Make sure we actually navigated to the expected page.
-			ok( $.mobile.activePage[ 0 ] == $( "#injected-test-page" )[ 0 ], "navigated successfully to #injected-test-page" );
+				// Now dynamically insert a page.
+				$ilpage.parent()
+					.append( "<div data-role='page' id='injected-test-page'>testing...</div>" );
 
-			start();
-		}
-	] );
-} );
+				// Now inject a link to this page dynamically and attempt to navigate
+				// to the page we just inserted.
+				$link.appendTo( $ilpage ).click();
+			},
 
-asyncTest( "application url with dialogHashKey loads application's first page", function() {
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			// Navigate to any page except the first page of the application.
-			$.testHelper.openPage( "#foo" );
-		},
+			function() {
 
-		function() {
-			ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ], "navigated successfully to #foo" );
+				// Make sure we actually navigated to the expected page.
+				assert.ok( $.mobile.activePage[ 0 ] == $( "#injected-test-page" )[ 0 ],
+					"navigated successfully to #injected-test-page" );
 
-			// Now navigate to an hash that contains just a dialogHashKey.
-			$.mobile.changePage( "#" + $.mobile.dialogHashKey );
-		},
+				QUnit.start();
+			}
+		] );
+	} );
 
-		function() {
-			// Make sure we actually navigated to the first page.
-			ok( $.mobile.activePage[ 0 ] === $.mobile.firstPage[ 0 ], "navigated successfully to first-page" );
+QUnit.asyncTest( "application url with dialogHashKey loads first application page",
+	function( assert ) {
+		$.testHelper.pageSequence( [
 
-			// Now make sure opening the page didn't result in page duplication.
-			ok( $.mobile.firstPage.hasClass( "first-page" ), "first page has expected class" );
-			deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
+			// Open our test page
+			function() {
+
+				// Navigate to any page except the first page of the application.
+				$.testHelper.openPage( "#foo" );
+			},
+
+			function() {
+				assert.ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ],
+					"navigated successfully to #foo" );
+
+				// Now navigate to an hash that contains just a dialogHashKey.
+				$.mobile.changePage( "#" + $.mobile.dialogHashKey );
+			},
+
+			function() {
+
+				// Make sure we actually navigated to the first page.
+				assert.ok( $.mobile.activePage[ 0 ] === $.mobile.firstPage[ 0 ],
+					"navigated successfully to first-page" );
+
+				// Now make sure opening the page didn't result in page duplication.
+				assert.hasClasses( $.mobile.firstPage, "first-page",
+					"first page has expected class" );
+				assert.strictEqual( $( ".first-page" ).length, 1,
+					"first page was not duplicated" );
+
+				QUnit.start();
+			}
+		] );
+	} );
 
-			start();
+QUnit.asyncTest( "navigate to non-existent internal page throws pagechangefailed",
+	function( assert ) {
+		var pagechangefailed = false,
+			pageChangeFailedCB = function( e ) {
+				pagechangefailed = true;
 		}
-	] );
-} );
 
-asyncTest( "navigate to non-existent internal page throws pagechangefailed", function() {
-	var pagechangefailed = false,
-		pageChangeFailedCB = function( e ) {
-			pagechangefailed = true;
-	}
+		$( document ).bind( "pagechangefailed", pageChangeFailedCB );
 
-	$( document ).bind( "pagechangefailed", pageChangeFailedCB );
+		$.testHelper.pageSequence( [
 
-	$.testHelper.pageSequence( [
-		// open our test page
-		function() {
-			// Make sure there's only one copy of the first-page in the DOM to begin with.
-			ok( $.mobile.firstPage.hasClass( "first-page" ), "first page has expected class" );
-			deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
+			// Open our test page
+			function() {
 
-			// Navigate to any page except the first page of the application.
-			$.testHelper.openPage( "#foo" );
-		},
+				// Make sure there's only one copy of the first-page in the DOM to begin with.
+				assert.hasClasses( $.mobile.firstPage, "first-page",
+					"first page has expected class" );
+				assert.strictEqual( $( ".first-page" ).length, 1,
+					"first page was not duplicated" );
 
-		function() {
-			var $foo = $( "#foo" );
-			ok( $.mobile.activePage[ 0 ] === $foo[ 0 ], "navigated successfully to #foo" );
-			deepEqual( pagechangefailed, false, "no page change failures" );
+				// Navigate to any page except the first page of the application.
+				$.testHelper.openPage( "#foo" );
+			},
 
-			// Now navigate to a non-existent page.
-			$foo.find( "#bad-internal-page-link" ).click();
-		},
+			function() {
+				var $foo = $( "#foo" );
+				assert.deepEqual( $.mobile.activePage[ 0 ], $foo[ 0 ],
+					"navigated successfully to #foo" );
+				assert.strictEqual( pagechangefailed, false, "no page change failures" );
 
-		function() {
-			// Make sure a pagechangefailed event was triggered.
-			deepEqual( pagechangefailed, true, "pagechangefailed dispatched" );
+				// Now navigate to a non-existent page.
+				$foo.find( "#bad-internal-page-link" ).click();
+			},
+
+			function() {
 
-			// Make sure we didn't navigate away from #foo.
-			ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ], "did not navigate away from #foo" );
+				// Make sure a pagechangefailed event was triggered.
+				assert.strictEqual( pagechangefailed, true, "pagechangefailed dispatched" );
 
-			// Now make sure opening the page didn't result in page duplication.
-			deepEqual( $( ".first-page" ).length, 1, "first page was not duplicated" );
+				// Make sure we didn't navigate away from #foo.
+				assert.ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ],
+					"did not navigate away from #foo" );
 
-			$( document ).unbind( "pagechangefailed", pageChangeFailedCB );
+				// Now make sure opening the page didn't result in page duplication.
+				assert.strictEqual( $( ".first-page" ).length, 1,
+					"first page was not duplicated" );
 
-			start();
-		}
-	] );
-} );
+				$( document ).unbind( "pagechangefailed", pageChangeFailedCB );
+
+				QUnit.start();
+			}
+		] );
+	} );
 
-asyncTest( "prefetched links with data rel dialog result in a dialog", function() {
+QUnit.asyncTest( "prefetched links with data rel dialog result in a dialog", function( assert ) {
 	$.testHelper.pageSequence( [
-		// open our test page
+
+		// Open our test page
 		function() {
+
 			// Navigate to any page except the first page of the application.
 			$.testHelper.openPage( "#prefetched-dialog-page" );
 		},
@@ -1273,57 +1408,67 @@ asyncTest( "prefetched links with data rel dialog result in a dialog", function(
 		},
 
 		function() {
-			ok( $.mobile.activePage.is( ".ui-dialog" ), "prefetched page is rendered as a dialog" );
-			start();
+			assert.hasClasses( $.mobile.activePage, "ui-page-dialog",
+				"prefetched page is rendered as a dialog" );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "first page gets reloaded if pruned from the DOM", function() {
+QUnit.asyncTest( "first page gets reloaded if pruned from the DOM", function( assert ) {
 	var hideCallbackTriggered = false;
 
 	function hideCallback( e, data ) {
 		var page = e.target;
-		ok( ( page === $.mobile.firstPage[ 0 ] ), "hide called with prevPage set to firstPage" );
+		assert.ok( ( page === $.mobile.firstPage[ 0 ] ),
+			"hide called with prevPage set to firstPage" );
 		if ( page === $.mobile.firstPage[ 0 ] ) {
 			$( page ).remove();
 		}
 		hideCallbackTriggered = true;
 	}
 
-	$( document ).bind( 'pagehide', hideCallback );
+	$( document ).bind( "pagehide", hideCallback );
 
 	$.testHelper.pageSequence( [
 		function() {
+
 			// Make sure the first page is actually in the DOM.
-			ok( $.mobile.firstPage.parent().length !== 0, "first page is currently in the DOM" );
+			assert.ok( $.mobile.firstPage.parent().length !== 0,
+				"first page is currently in the DOM" );
 
 			// Make sure the first page is the active page.
-			ok( $.mobile.activePage[ 0 ] === $.mobile.firstPage[ 0 ], "first page is the active page" );
+			assert.ok( $.mobile.activePage[ 0 ] === $.mobile.firstPage[ 0 ],
+				"first page is the active page" );
 
 			// Now make sure the first page has an id that we can use to reload it.
-			ok( $.mobile.firstPage[ 0 ].id, "first page has an id" );
+			assert.ok( $.mobile.firstPage[ 0 ].id, "first page has an id" );
 
 			// Make sure there is only one first page in the DOM.
-			deepEqual( $( ".first-page" ).length, 1, "only one instance of the first page in the DOM" );
+			assert.strictEqual( $( ".first-page" ).length, 1,
+				"only one instance of the first page in the DOM" );
 
 			// Navigate to any page except the first page of the application.
 			$.testHelper.openPage( "#foo" );
 		},
 
 		function() {
+
 			// Make sure the active page is #foo.
-			ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ], "navigated successfully to #foo" );
+			assert.ok( $.mobile.activePage[ 0 ] === $( "#foo" )[ 0 ],
+				"navigated successfully to #foo" );
 
 			// Make sure our hide callback was triggered.
-			ok( hideCallbackTriggered, "hide callback was triggered" );
+			assert.ok( hideCallbackTriggered, "hide callback was triggered" );
 
 			// Make sure the first page was actually pruned from the document.
-			ok( $.mobile.firstPage.parent().length === 0, "first page was pruned from the DOM" );
-			deepEqual( $( ".first-page" ).length, 0, "no instance of the first page in the DOM" );
+			assert.ok( $.mobile.firstPage.parent().length === 0,
+				"first page was pruned from the DOM" );
+			assert.strictEqual( $( ".first-page" ).length, 0,
+				"no instance of the first page in the DOM" );
 
 			// Remove our hideCallback.
-			$( document ).unbind( 'pagehide', hideCallback );
+			$( document ).unbind( "pagehide", hideCallback );
 
 			// Navigate back to the first page!
 			$.testHelper.openPage( "#" + $.mobile.firstPage[ 0 ].id );
@@ -1333,25 +1478,28 @@ asyncTest( "first page gets reloaded if pruned from the DOM", function() {
 			var firstPage = $( ".first-page" );
 
 			// We should only have one first page in the document at any time!
-			deepEqual( firstPage.length, 1, "single instance of first page recreated in the DOM" );
+			assert.strictEqual( firstPage.length, 1,
+				"single instance of first page recreated in the DOM" );
 
-			// Make sure the first page in the DOM is actually a different DOM element than the original
-			// one we started with.
-			ok( $.mobile.firstPage[ 0 ] !== firstPage[ 0 ], "first page is a new DOM element" );
+			// Make sure the first page in the DOM is actually a different DOM element than the
+			// original one we started with.
+			assert.ok( $.mobile.firstPage[ 0 ] !== firstPage[ 0 ],
+				"first page is a new DOM element" );
 
 			// Make sure we actually navigated to the new first page.
-			ok( $.mobile.activePage[ 0 ] === firstPage[ 0 ], "navigated successfully to new first-page" );
+			assert.ok( $.mobile.activePage[ 0 ] === firstPage[ 0 ],
+				"navigated successfully to new first-page" );
 
 			// Reset the $.mobile.firstPage	for subsequent tests.
 			// XXX: Should we just get rid of the new one and restore the old?
 			$.mobile.firstPage = $.mobile.activePage;
 
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "test that clicks are ignored where data-ajax='false' parents exist", function() {
+QUnit.asyncTest( "clicks are ignored where data-ajax='false' parents exist", function( assert ) {
 	var $disabledByParent = $( "#unhijacked-link-by-parent" ),
 		$disabledByAttr = $( "#unhijacked-link-by-attr" );
 
@@ -1363,39 +1511,42 @@ asyncTest( "test that clicks are ignored where data-ajax='false' parents exist",
 		},
 
 		function() {
-			$( "#hijacked-link" ).trigger( 'click' );
+			$( "#hijacked-link" ).trigger( "click" );
 		},
 
 		function() {
-			ok( $.mobile.activePage.is( "#link-hijacking-destination" ), "nav works for links to hijacking destination" );
+			assert.strictEqual( $.mobile.activePage.attr( "id" ), "link-hijacking-destination",
+				"nav works for links to hijacking destination" );
 			window.history.back();
 		},
 
 		function() {
-			$disabledByParent.trigger( 'click' );
+			$disabledByParent.trigger( "click" );
 		},
 
 		function() {
-			ok( $.mobile.activePage.is( "#link-hijacking-test" ), "click should be ignored keeping the active mobile page the same as before" );
+			assert.strictEqual( $.mobile.activePage.attr( "id" ), "link-hijacking-test",
+				"click should be ignored keeping the active mobile page the same as before" );
 		},
 
 		function() {
-			$disabledByAttr.trigger( 'click' );
+			$disabledByAttr.trigger( "click" );
 		},
 
 		function() {
-			ok( $.mobile.activePage.is( "#link-hijacking-test" ), "click should be ignored keeping the active mobile page the same as before" );
+			assert.strictEqual( $.mobile.activePage.attr( "id" ), "link-hijacking-test",
+				"click should be ignored keeping the active mobile page the same as before" );
 
 			$.mobile.ignoreContentEnabled = false;
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "vclicks are ignored where data-ajax='false' parents exist", function() {
-	var $disabledByParent = $( "#unhijacked-link-by-parent" ),
-		$disabledByAttr = $( "#unhijacked-link-by-attr" ),
-		$hijacked = $( "#hijacked-link" );
+QUnit.asyncTest( "vclicks are ignored where data-ajax='false' parents exist", function( assert ) {
+	var disabledByParent = $( "#unhijacked-link-by-parent" ),
+		disabledByAttr = $( "#unhijacked-link-by-attr" ),
+		hijacked = $( "#hijacked-link" );
 
 	$.mobile.ignoreContentEnabled = true;
 
@@ -1405,24 +1556,28 @@ asyncTest( "vclicks are ignored where data-ajax='false' parents exist", function
 		},
 
 		function() {
-			// force the active button class
-			$hijacked.addClass( "ui-button-active" );
-			$hijacked.trigger( 'vclick' );
-			ok( $hijacked.hasClass( "ui-button-active" ), "active button class is added to the link per normal" );
 
-			$disabledByParent.trigger( 'vclick' );
-			ok( !$disabledByParent.hasClass( "ui-button-active" ), "active button class is never added to the link" );
+			// Force the active button class
+			hijacked.addClass( "ui-button-active" );
+			hijacked.trigger( "vclick" );
+			assert.hasClasses( hijacked, "ui-button-active",
+				"active button class is added to the link per normal" );
+
+			disabledByParent.trigger( "vclick" );
+			assert.lacksClasses( disabledByParent, "ui-button-active",
+				"active button class is never added to the link" );
 
-			$disabledByAttr.trigger( 'vclick' );
-			ok( !$disabledByAttr.hasClass( "ui-button-active" ), "active button class is never added to the link" );
+			disabledByAttr.trigger( "vclick" );
+			assert.lacksClasses( disabledByAttr, "ui-button-active",
+				"active button class is never added to the link" );
 
 			$.mobile.ignoreContentEnabled = false;
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "data-urls with parens work properly (avoid jqmData regex)", function() {
+QUnit.asyncTest( "data-urls with parens work properly (avoid jqmData regex)", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "data-url-tests/parentheses.html?foo=(bar)" );
@@ -1433,69 +1588,74 @@ asyncTest( "data-urls with parens work properly (avoid jqmData regex)", function
 		},
 
 		function( timedOut ) {
-			ok( !timedOut, "the call to back didn't time out" );
+			assert.ok( !timedOut, "the call to back didn't time out" );
 			window.history.forward();
 		},
 
 		function() {
-			equal( $.trim( $.mobile.activePage.text() ), "Parens!", "the page loaded" );
-			start();
+			assert.equal( $.trim( $.mobile.activePage.text() ), "Parens!", "the page loaded" );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "loading an embedded page with query params works", function() {
+QUnit.asyncTest( "loading an embedded page with query params works", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "#bar?baz=bak", { dataUrl: false } );
 		},
 
 		function() {
-			ok( location.hash.indexOf( "bar?baz=bak" ) >= -1, "the hash is targeted at the page to be loaded" );
-			ok( $.mobile.activePage.attr( "id" ), "bar", "the correct page is loaded" );
-			start();
+			assert.ok( location.hash.indexOf( "bar?baz=bak" ) >= -1,
+				"the hash is targeted at the page to be loaded" );
+			assert.ok( $.mobile.activePage.attr( "id" ), "bar", "the correct page is loaded" );
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "external page is accessed correctly even if it has a space in the url", function() {
-	$.testHelper.pageSequence( [
-		function() {
-			$.mobile.changePage( " external.html" );
-		},
-		function() {
-			equal( $.mobile.activePage.attr( "id" ), "external-test", "the correct page is loaded" );
-			start();
-		}
+QUnit.asyncTest( "external page is accessed correctly even if it has a space in the url",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			function() {
+				$.mobile.changePage( " external.html" );
+			},
+			function() {
+				assert.equal( $.mobile.activePage.attr( "id" ), "external-test",
+					"the correct page is loaded" );
+				QUnit.start();
+			}
 
-	] );
-} );
+		] );
+	} );
 
 var absHomeUrl = $.mobile.path.parseLocation().hrefNoHash,
 	homeDomain = $.mobile.path.parseLocation().domain;
 
-asyncTest( "page load events are providided with the absolute url for the content", function() {
-	var requestPath;
+QUnit.asyncTest( "page load events are providided with the absolute url for the content",
+	function( assert ) {
+		var requestPath;
 
-	expect( 3 );
+		assert.expect( 3 );
 
-	$( document ).one( "pagebeforechange", function( event, data ) {
-		equal( data.absUrl, absHomeUrl + "#bar" );
-	} );
+		$( document ).one( "pagebeforechange", function( event, data ) {
+			assert.equal( data.absUrl, absHomeUrl + "#bar" );
+		} );
 
-	$( document ).one( "pagechange", function( event, data ) {
-		equal( data.absUrl, absHomeUrl + "#bar" );
-	} );
+		$( document ).one( "pagechange", function( event, data ) {
+			assert.equal( data.absUrl, absHomeUrl + "#bar" );
+		} );
 
-	$.mobile.changePage( "#bar" );
+		$.mobile.changePage( "#bar" );
 
-	requestPath = "/theres/no/way/this/page/exists.html";
+		requestPath = "/theres/no/way/this/page/exists.html";
 
-	$( document ).one( "pagechangefailed", function( event, data ) {
-		equal( data.absUrl, homeDomain + requestPath );
-		start();
+		$( document ).one( "pagechangefailed", function( event, data ) {
+			assert.equal( data.absUrl, homeDomain + requestPath );
+			QUnit.start();
+		} );
+
+		$.mobile.changePage( requestPath );
 	} );
 
-	$.mobile.changePage( requestPath );
-} );
-} )( jQuery );
+} )( QUnit, jQuery );
diff --git a/tests/integration/navigation/prefetched-dialog.html b/tests/integration/navigation/prefetched-dialog.html
index bea17990ca1..42ef648589e 100644
--- a/tests/integration/navigation/prefetched-dialog.html
+++ b/tests/integration/navigation/prefetched-dialog.html
@@ -5,6 +5,6 @@
 	<title>Title Tag</title>
 </head>
 <body>
-  <div data-nstest-role="page" id="prefetched-dialog"></div>
+	<div data-nstest-role="dialog" id="prefetched-dialog"></div>
 </body>
 </html>
diff --git a/tests/integration/navigation/sequence/index.html b/tests/integration/navigation/sequence/index.html
index 2e982bbb56b..bbb657a669e 100644
--- a/tests/integration/navigation/sequence/index.html
+++ b/tests/integration/navigation/sequence/index.html
@@ -20,22 +20,18 @@
 	<script src="../../../../external/qunit/qunit.js"></script>
 	<link rel="stylesheet" href="../../../jqm-tests.css"/>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[
-				"widgets/dialog",
-				"widgets/page.dialog",
+				"widgets/page.dialog.backcompat",
 				"widgets/popup"
 			],
 			[ "init" ],
-			[
-				"sequence_core.js"
-			]
-		], "../../../../js");
+			[ "sequence_core.js" ]
+		], "../../../../js" );
 	</script>
 
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
-	<script src="../../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/navigation/sequence/sequence-redirect.html b/tests/integration/navigation/sequence/sequence-redirect.html
index db279930513..803b0a1847b 100644
--- a/tests/integration/navigation/sequence/sequence-redirect.html
+++ b/tests/integration/navigation/sequence/sequence-redirect.html
@@ -20,22 +20,18 @@
 	<script src="../../../../external/qunit/qunit.js"></script>
 	<link rel="stylesheet" href="../../../jqm-tests.css"/>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[
-				"widgets/dialog",
-				"widgets/page.dialog",
+				"widgets/page.dialog.backcompat",
 				"widgets/popup"
 			],
 			[ "init" ],
-			[
-				"sequence_core.js"
-			]
-		], "../../../../js");
+			[ "sequence_core.js" ]
+		], "../../../../js" );
 	</script>
 
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
-	<script src="../../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/page/index.html b/tests/integration/page/index.html
index 2f096cf100a..92f95604826 100644
--- a/tests/integration/page/index.html
+++ b/tests/integration/page/index.html
@@ -11,23 +11,20 @@
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
-			[
-				"widgets/toolbar"
-
-			],
+		$.testHelper.asyncLoad( [
+			[ "widgets/toolbar" ],
 			[ "init" ],
 			[ "page_title_entity.js" ],
-			[ "page_enhance_within.js" ]
-		]);
+			[ "page_enhance_within.js" ],
+			[ "page_theme.js" ]
+		] );
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
@@ -45,5 +42,10 @@ <h1>Page title contains an entity: &lt;&amp;&gt;&copy;</h1>
 		</div>
 	</div>
 
+	<div data-nstest-role="page" id="theme-test">
+		<div class="ui-content">
+			<p>Page that inherits its theme</p>
+		</div>
+	</div>
 </body>
 </html>
diff --git a/tests/integration/page/page_enhance_within.js b/tests/integration/page/page_enhance_within.js
index 38b14f540ea..a764b5358d5 100644
--- a/tests/integration/page/page_enhance_within.js
+++ b/tests/integration/page/page_enhance_within.js
@@ -1,21 +1,25 @@
-asyncTest( "Option enhanceWithin", function() {
-$.testHelper.pageSequence( [
-	function() {
-		$( "#open-enhance" ).click();
-	},
-	function() {
-		deepEqual( !!$( "#enhance-header" ).toolbar( "instance" ), true,
-			"Page with option enhance contains a toolbar widget" );
-		$.mobile.back();
-	},
-	function() {
-		$( "#open-no-enhance" ).click();
-	},
-	function() {
-		deepEqual( !!$( "#no-enhance-header" ).toolbar( "instance" ), false,
-			"Page with option enhance turned off contains no toolbar widget" );
-		$.mobile.back();
-	},
-	start
-] );
+( function( QUnit, $ ) {
+
+QUnit.asyncTest( "Option enhanceWithin", function( assert ) {
+	$.testHelper.pageSequence( [
+		function() {
+			$( "#open-enhance" ).click();
+		},
+		function() {
+			assert.strictEqual( !!$( "#enhance-header" ).toolbar( "instance" ), true,
+				"Page with option enhance contains a toolbar widget" );
+			$.mobile.back();
+		},
+		function() {
+			$( "#open-no-enhance" ).click();
+		},
+		function() {
+			assert.strictEqual( !!$( "#no-enhance-header" ).toolbar( "instance" ), false,
+				"Page with option enhance turned off contains no toolbar widget" );
+			$.mobile.back();
+		},
+		QUnit.start
+	] );
 } );
+
+} )( QUnit, jQuery );
diff --git a/tests/integration/page/page_theme.js b/tests/integration/page/page_theme.js
new file mode 100644
index 00000000000..589b7f8f78a
--- /dev/null
+++ b/tests/integration/page/page_theme.js
@@ -0,0 +1,36 @@
+( function( QUnit, $ ) {
+
+QUnit.test( "Page theme", function( assert ) {
+	var testDone = assert.async(),
+		page = $( "#theme-test" );
+
+	assert.expect( 6 );
+	$.testHelper.pageSequence( [
+		function() {
+			$( "body" ).pagecontainer( "change", page );
+		},
+		function() {
+			assert.hasClasses( page, "ui-page-active ui-page-theme-a",
+				"Page is active and initial swatch is correct: a" );
+
+			page.page( "option", "theme", "b" );
+			assert.hasClasses( page, "ui-page-theme-b",
+				"Correctly set swatch to b" );
+			assert.lacksClasses( page, "ui-page-theme-a",
+				"Initial swatch (a) is now absent" );
+
+			page.page( "option", "theme", "c" );
+			assert.hasClasses( page, "ui-page-theme-c",
+				"Second option change: correctly set swatch to c" );
+			assert.lacksClasses( page, "ui-page-theme-a",
+				"Second option change: initial swatch (a) is absent" );
+			assert.lacksClasses( page, "ui-page-theme-b",
+				"Second option change: first set swatch (b) is absent" );
+
+			$.mobile.back();
+		},
+		testDone
+	] );
+} );
+
+} )( QUnit, jQuery );
diff --git a/tests/integration/page/page_title_entity.js b/tests/integration/page/page_title_entity.js
index d311842b754..5e28d271f6b 100644
--- a/tests/integration/page/page_title_entity.js
+++ b/tests/integration/page/page_title_entity.js
@@ -1,20 +1,23 @@
-( function( $, undefined ) {
+( function( QUnit, $ ) {
 module( "page" );
 
-asyncTest( "Entity in page title", function() {
+QUnit.asyncTest( "Entity in page title", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$( "#openTestPage" ).click();
 		},
 
 		function() {
-			deepEqual( $.mobile.activePage.attr( "id" ), "title-test", "Title test page is active" );
-			deepEqual( document.title.length > 0, true, "Document title is not empty" );
-			deepEqual( !!document.title.match( /&([a-zA-Z]+|#([0-9]+|[xX][0-9a-fA-F]+));/ ), false, "Document title contains no character references" );
+			assert.strictEqual( $.mobile.activePage.attr( "id" ), "title-test",
+				"Title test page is active" );
+			assert.strictEqual( document.title.length > 0, true, "Document title is not empty" );
+			assert.strictEqual(
+				!!document.title.match( /&([a-zA-Z]+|#([0-9]+|[xX][0-9a-fA-F]+));/ ),
+				false, "Document title contains no character references" );
 			$.mobile.back();
 		},
 
-		start
+		QUnit.start
 	] );
 } );
-} )( jQuery );
+} )( QUnit, jQuery );
diff --git a/tests/integration/pagecontainer/page_event_sequence_core.js b/tests/integration/pagecontainer/page_event_sequence_core.js
index 6f36f751f0b..7becb30cde9 100644
--- a/tests/integration/pagecontainer/page_event_sequence_core.js
+++ b/tests/integration/pagecontainer/page_event_sequence_core.js
@@ -1,4 +1,4 @@
-( function() {
+( function( QUnit, $ ) {
 
 var eventSequence,
 	eventsList = [
@@ -13,7 +13,6 @@ var eventSequence,
 		"pagehide",
 		"pageshow",
 		"pagechange",
-		"pageinit",
 
 		// Valid as of 1.4.x
 		"pagecontainerbeforechange",
@@ -51,7 +50,7 @@ var eventSequence,
 		} );
 	};
 
-module( "Page event sequence tests", {
+QUnit.module( "Page event sequence tests", {
 	setup: function() {
 		eventSequence = [];
 
@@ -74,7 +73,7 @@ function makeOtherPageUrl( filename ) {
 	} ) );
 }
 
-asyncTest( "Event sequence during navigation to another page", function() {
+QUnit.asyncTest( "Event sequence during navigation to another page", function( assert ) {
 	expect( 1 );
 
 	var otherPageUrl = makeOtherPageUrl( "other-page.html" ),
@@ -110,10 +109,6 @@ asyncTest( "Event sequence during navigation to another page", function() {
 			{ type: "pagecreate", target: "other-page",
 			data: { prevPage: undefined, nextPage: undefined, toPage: undefined } },
 
-			// Deprecated as of 1.4.0
-			{ type: "pageinit", target: "other-page",
-			data: { prevPage: undefined, nextPage: undefined, toPage: undefined } },
-
 			// Deprecated as of 1.4.0
 			{ type: "pagebeforechange", target: "the-body",
 			data: { prevPage: "start-page", nextPage: undefined, toPage: "other-page" } },
@@ -176,17 +171,17 @@ asyncTest( "Event sequence during navigation to another page", function() {
 			$( "#go-to-other-page" ).click();
 		},
 		function() {
-			deepEqual( eventSequence, expectedEventSequence, "Event sequence as expected" );
+			assert.deepEqual( eventSequence, expectedEventSequence, "Event sequence as expected" );
 			$( ":mobile-pagecontainer" ).pagecontainer( "back" );
 		},
 		function() {
-			start();
+			QUnit.start();
 		}
 	] );
 } );
 
-asyncTest( "Event sequence during page load failure", function() {
-	expect( 1 );
+QUnit.asyncTest( "Event sequence during page load failure", function( assert ) {
+	assert.expect( 1 );
 
 	var otherPageUrl = makeOtherPageUrl( "page-does-not-exist.html" ),
 		expectedEventSequence = [
@@ -227,17 +222,18 @@ asyncTest( "Event sequence during page load failure", function() {
 			}
 		},
 		function() {
-			deepEqual( eventSequence, expectedEventSequence, "Event sequence as expected" );
-			start();
+			assert.deepEqual( eventSequence, expectedEventSequence, "Event sequence as expected" );
+			QUnit.start();
 		}
 	] );
 } );
-module( "load method" );
-test( "load does not trigger an error when called withput a second param", function() {
-	var otherPageUrl = makeOtherPageUrl( "other-page.html" ),
-		pagecontainer = $( ":mobile-pagecontainer" );
+QUnit.module( "load method" );
+QUnit.test( "load does not trigger an error when called without a second param",
+	function( assert ) {
+		var otherPageUrl = makeOtherPageUrl( "other-page.html" ),
+			pagecontainer = $( ":mobile-pagecontainer" );
 
-	throws( !pagecontainer.pagecontainer( "load", otherPageUrl ) );
-} );
+		assert.throws( !pagecontainer.pagecontainer( "load", otherPageUrl ) );
+	} );
 
-} )();
+} )( QUnit, jQuery );
diff --git a/tests/integration/pagecontainer/transition-choice-dialog-tests.html b/tests/integration/pagecontainer/transition-choice-dialog-tests.html
index 40c8bd95391..67aa9af92f8 100644
--- a/tests/integration/pagecontainer/transition-choice-dialog-tests.html
+++ b/tests/integration/pagecontainer/transition-choice-dialog-tests.html
@@ -16,16 +16,12 @@
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
 	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
-			[ "widgets/dialog" ],
+		$.testHelper.asyncLoad( [
+			[ "widgets/page.dialog.backcompat" ],
 			[ "init" ],
-			[
-				"transition_choice_dialog_core.js"
-			]
-		]);
+			[ "transition_choice_dialog_core.js" ]
+		] );
 	</script>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 	<div id="qunit"></div>
diff --git a/tests/integration/popup/index.html b/tests/integration/popup/index.html
index 5e4911a387d..350737fd0cf 100644
--- a/tests/integration/popup/index.html
+++ b/tests/integration/popup/index.html
@@ -32,7 +32,7 @@
 			[
 				"widgets/popup",
 				"widgets/listview",
-				"widgets/dialog"
+				"widgets/page.dialog"
 			],
 			[ "init" ],
 			[ "popup_core.js" ]
diff --git a/tests/integration/select/cached-tests.html b/tests/integration/select/cached-tests.html
index 30cae580b40..a5ec9a68263 100644
--- a/tests/integration/select/cached-tests.html
+++ b/tests/integration/select/cached-tests.html
@@ -15,18 +15,14 @@
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
-			[
-				"widgets/forms/select",
-				"widgets/forms/select.custom"
-			],
+		$.testHelper.asyncLoad( [
+			[ "widgets/forms/select.custom" ],
 			[ "init" ],
-			[	"select_cached.js" ]
-		]);
+			[ "select_cached.js" ]
+		] );
 	</script>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/select/index.html b/tests/integration/select/index.html
index a468f129827..7a82da5114c 100644
--- a/tests/integration/select/index.html
+++ b/tests/integration/select/index.html
@@ -10,26 +10,22 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
+		$.testHelper.asyncLoad( [
 			[
-				"widgets/forms/select",
 				"widgets/forms/select.custom",
 				"../../integration/select/defineKeepNative.js"
 			],
 			[ "init" ],
-			[
-				"select_core.js"
-			]
-		]);
+			[ "select_core.js" ]
+		] );
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/integration/select/select_cached.js b/tests/integration/select/select_cached.js
index 3678795130f..c38f0ba9872 100644
--- a/tests/integration/select/select_cached.js
+++ b/tests/integration/select/select_cached.js
@@ -2,136 +2,153 @@
  * mobile select unit tests
  */
 
-( function( $ ) {
+( function( QUnit, $ ) {
 var resetHash;
 
+function jqmDataSelector( expression ) {
+	return "[data-" + $.mobile.ns + expression + "]";
+}
+
 resetHash = function( timeout ) {
 	$.testHelper.openPage( location.hash.indexOf( "#default" ) >= 0 ? "#" : "#default" );
 };
 
 // https://github.com/jquery/jquery-mobile/issues/2181
-asyncTest( "dialog sized select should alter the value of its parent select", function() {
-	var selectButton, value;
-
-	$.testHelper.pageSequence( [
-		resetHash,
-
-		function() {
-			$.mobile.changePage( "cached.html" );
-		},
-
-		function() {
-			ok( $.mobile.activePage.is( "#dialog-select-parent-cache-test" ), "cached page appears" );
-			selectButton = $( "#cached-page-select" ).siblings( 'a' );
-			selectButton.click();
-		},
-
-		function() {
-			ok( $.mobile.activePage.hasClass( 'ui-dialog' ), "the dialog came up" );
-			var option = $.mobile.activePage.find( "li a" ).not( ":contains('" + selectButton.text() + "')" ).last();
-			value = $.trim( option.text() );
-			option.click();
-		},
-
-		function() {
-			deepEqual( value, $.trim( selectButton.text() ), "the selected value is propogated back to the button text" );
-			start();
-		}
-	] );
-} );
+QUnit.asyncTest( "dialog sized select should alter the value of its parent select",
+	function( assert ) {
+		var selectButton, value;
+
+		$.testHelper.pageSequence( [
+			resetHash,
+
+			function() {
+				$.mobile.changePage( "cached.html" );
+			},
+
+			function() {
+				assert.ok( $.mobile.activePage.is( "#dialog-select-parent-cache-test" ),
+					"cached page appears" );
+				selectButton = $( "#cached-page-select" ).siblings( "a" );
+				selectButton.click();
+			},
+
+			function() {
+				assert.hasClasses( $.mobile.activePage, "ui-page-dialog", "the dialog came up" );
+				var option = $.mobile.activePage.find( "li a" )
+					.not( ":contains('" + selectButton.text() + "')" ).last();
+				value = $.trim( option.text() );
+				option.click();
+			},
+
+			function() {
+				assert.strictEqual( value, $.trim( selectButton.text() ),
+					"the selected value is propogated back to the button text" );
+				QUnit.start();
+			}
+		] );
+	} );
 
 // https://github.com/jquery/jquery-mobile/issues/2181
-asyncTest( "dialog sized select should prevent the removal of its parent page from the dom", function() {
-	var selectButton, parentPageId;
-
-	expect( 2 );
-
+QUnit.asyncTest( "dialog sized select should prevent the removal of its parent page",
+	function( assert ) {
+		var selectButton, parentPageId;
+
+		assert.expect( 2 );
+
+		$.testHelper.pageSequence( [
+			resetHash,
+
+			function() {
+				$.mobile.changePage( "cached.html" );
+			},
+
+			function() {
+				selectButton = $.mobile.activePage.find( "#cached-page-select" ).siblings( "a" );
+				parentPageId = $.mobile.activePage.attr( "id" );
+				assert.strictEqual( $( "#" + parentPageId ).length, 1,
+					"establish the parent page exists" );
+				selectButton.click();
+			},
+
+			function() {
+				assert.strictEqual( $( "#" + parentPageId ).length, 1,
+					"make sure parent page is still there after opening the dialog" );
+				$.mobile.activePage.find( "li a" ).last().click();
+			},
+
+			QUnit.start
+		] );
+	} );
+
+QUnit.asyncTest( "dialog sized select shouldn't rebind its parent page remove handler when " +
+	"closing, if the parent page domCache option is true", function( assert ) {
+		expect( 3 );
+
+		$.testHelper.pageSequence( [
+			resetHash,
+
+			function() {
+				$.mobile.changePage( "cached-dom-cache-true.html" );
+			},
+
+			function() {
+				$.mobile.activePage.find( "#domcache-page-select" ).siblings( "a" ).click();
+			},
+
+			function() {
+				assert.hasClasses( $.mobile.activePage, "ui-page-dialog", "the dialog came up" );
+				$.mobile.activePage.find( "li a" ).last().click();
+			},
+
+			function() {
+				assert.ok( $.mobile.activePage.is( "#dialog-select-parent-domcache-test" ),
+					"the dialog closed" );
+				$.mobile.changePage( $( "#default" ) );
+			},
+
+			function() {
+				assert.strictEqual( $( "#dialog-select-parent-domcache-test" ).length, 1,
+					"select parent page is still cached in the dom after changing page" );
+				QUnit.start();
+			}
+		] );
+	} );
+
+QUnit.asyncTest( "menupage is removed when the parent page is removed", function( assert ) {
+	var dialogCount = $( jqmDataSelector( "role='dialog'" ) ).length;
 	$.testHelper.pageSequence( [
 		resetHash,
 
 		function() {
-			$.mobile.changePage( "cached.html" );
-		},
-
-		function() {
-			selectButton = $.mobile.activePage.find( "#cached-page-select" ).siblings( 'a' );
-			parentPageId = $.mobile.activePage.attr( 'id' );
-			deepEqual( $( "#" + parentPageId ).length, 1, "establish the parent page exists" );
-			selectButton.click();
-		},
-
-		function() {
-			deepEqual( $( "#" + parentPageId ).length, 1, "make sure parent page is still there after opening the dialog" );
-			$.mobile.activePage.find( "li a" ).last().click();
-		},
-
-		start
-	] );
-} );
-
-asyncTest( "dialog sized select shouldn't rebind its parent page remove handler when closing, if the parent page domCache option is true", function() {
-	expect( 3 );
-
-	$.testHelper.pageSequence( [
-		resetHash,
-
-		function() {
-			$.mobile.changePage( "cached-dom-cache-true.html" );
-		},
-
-		function() {
-			$.mobile.activePage.find( "#domcache-page-select" ).siblings( 'a' ).click();
-		},
-
-		function() {
-			ok( $.mobile.activePage.hasClass( 'ui-dialog' ), "the dialog came up" );
-			$.mobile.activePage.find( "li a" ).last().click();
+			$.mobile.changePage( "uncached-dom-cached-false.html" );
 		},
 
 		function() {
-			ok( $.mobile.activePage.is( "#dialog-select-parent-domcache-test" ), "the dialog closed" );
-			$.mobile.changePage( $( "#default" ) );
-		},
 
-		function() {
-			deepEqual( $( "#dialog-select-parent-domcache-test" ).length, 1, "make sure the select parent page is still cached in the dom after changing page" );
-			start();
-		}
-	] );
-} );
+			// For performance reasons we don't initially create the menu dialog now
+			assert.strictEqual( $( jqmDataSelector( "role='dialog'" ) ).length, dialogCount );
 
-asyncTest( "menupage is removed when the parent page is removed", function() {
-	var dialogCount = $( ":jqmData(role='dialog')" ).length;
-	$.testHelper.pageSequence( [
-		resetHash,
-
-		function() {
-			$.mobile.changePage( "uncached-dom-cached-false.html" );
+			// Manually trigger dialog opening
+			$( "#domcache-uncached-page-select" ).data( "mobile-selectmenu" ).open();
 		},
 
 		function() {
-			// for performance reason we don't initially create the menu dialog now
-			deepEqual( $( ":jqmData(role='dialog')" ).length, dialogCount );
 
-			// manually trigger dialog opening
-			$( "#domcache-uncached-page-select" ).data( 'mobile-selectmenu' ).open();
+			// Check if dialog was successfully  created
+			assert.strictEqual( $( jqmDataSelector( "role='dialog'" ) ).length, dialogCount + 1 );
+			$( "#domcache-uncached-page-select" ).data( "mobile-selectmenu" ).close();
 		},
 
 		function() {
-			// check if dialog was successfully  created
-			deepEqual( $( ":jqmData(role='dialog')" ).length, dialogCount + 1 );
-			$( "#domcache-uncached-page-select" ).data( 'mobile-selectmenu' ).close();
-		},
 
-		function() {
-			// navigate to parent(initial) page
+			// Navigate to parent(initial) page
 			window.history.back();
 		},
 
 		function() {
-			deepEqual( $( ":jqmData(role='dialog')" ).length, dialogCount );
-			start();
+			assert.strictEqual( $( jqmDataSelector( "role='dialog'" ) ).length, dialogCount );
+			QUnit.start();
 		}
 	] );
 } );
-} )( jQuery );
+} )( QUnit, jQuery );
diff --git a/tests/integration/select/select_core.js b/tests/integration/select/select_core.js
index 6f8484f65f2..a2ce4af6e43 100644
--- a/tests/integration/select/select_core.js
+++ b/tests/integration/select/select_core.js
@@ -2,7 +2,7 @@
  * mobile select unit tests
  */
 
-( function( $ ) {
+( function( QUnit, $ ) {
 var libName = "forms.select",
 	originalDefaultDialogTrans = $.mobile.defaultDialogTransition,
 	originalDefTransitionHandler = $.mobile.defaultTransitionHandler.prototype.transition,
@@ -19,12 +19,12 @@ closeDialog = function( timeout ) {
 
 var homeWithSearch = $.mobile.path.parseUrl( location.pathname ).pathname + location.search;
 
-test( "No tags are accidentally injected during list building", function() {
-	deepEqual( $( "#encoding-test-menu > li:first-child > a > script" ).length, 0,
+QUnit.test( "No tags are accidentally injected during list building", function( assert ) {
+	assert.strictEqual( $( "#encoding-test-menu > li:first-child > a > script" ).length, 0,
 		"No script tag has ended up inside the anchor" );
 } );
 
-module( libName, {
+QUnit.module( libName, {
 	setup: function() {
 		$.mobile.navigate.history.stack = [];
 		$.mobile.navigate.history.activeIndex = 0;
@@ -40,136 +40,156 @@ module( libName, {
 	}
 } );
 
-asyncTest( "placeholder correctly gets ui-screen-hidden class after rebuilding", function() {
-	expect( 3 );
+QUnit.asyncTest( "placeholder correctly gets ui-screen-hidden after rebuilding",
+	function( assert ) {
+		assert.expect( 3 );
 
-	$.testHelper.sequence( [
-		function() {
-			// bring up the optgroup menu
-			ok( $( "#optgroup-and-placeholder-container a" ).length > 0, "there is in fact a button in the page" );
-			deepEqual( $( "#optgroup-and-placeholder-menu li.ui-li-divider" )
-				.first().hasClass( "ui-bar-b" ), true, "Optgroup header has swatch b" );
-			$( "#optgroup-and-placeholder-container a" ).trigger( "click" );
-		},
+		$.testHelper.sequence( [
+			function() {
 
-		function() {
-			//select the first menu item
-			$( "#optgroup-and-placeholder-menu li:not(.ui-screen-hidden) a:first" ).click();
-		},
+				// Bring up the optgroup menu
+				ok( $( "#optgroup-and-placeholder-container a" ).length > 0,
+					"there is in fact a button in the page" );
+				assert.hasClasses( $( "#optgroup-and-placeholder-menu li.ui-li-divider" ).first(),
+					"ui-bar-b", "Optgroup header has swatch b" );
+				$( "#optgroup-and-placeholder-container a" ).trigger( "click" );
+			},
 
-		function() {
-			ok( $( "#optgroup-and-placeholder-menu li:first" ).hasClass( "ui-screen-hidden" ), "the placeholder item has the ui-screen-hidden class" );
-			start();
-		}
-	], 1000 );
-} );
+			function() {
 
-asyncTest( "firing a click at least 400 ms later on the select screen overlay does close it", function() {
-	expect( 3 );
+				// Select the first menu item
+				$( "#optgroup-and-placeholder-menu li:not(.ui-screen-hidden) a:first" ).click();
+			},
 
-	var prefix = ".firingAClick";
-	$.testHelper.detailedEventCascade( [
-		function() {
-			// bring up the smaller choice menu
-			ok( $( "#select-choice-few-container a" ).length > 0, "there is in fact a button in the page" );
-			$( "#select-choice-few-container a" ).trigger( "click" );
-		},
+			function() {
+				assert.hasClasses( $( "#optgroup-and-placeholder-menu li:first" ),
+					"ui-screen-hidden", "the placeholder item has the ui-screen-hidden class" );
+				QUnit.start();
+			}
+		], 1000 );
+	} );
 
-		{
-			popupafteropen: { src: $( "#select-choice-few\\.dotTest-listbox" ), event: "popupafteropen" + prefix },
-			timeout: { length: 1000 }
-		},
+QUnit.asyncTest( "firing a click at least 400ms later on the select screen closes it",
+	function( assert ) {
+		assert.expect( 3 );
 
-		function( result ) {
-			deepEqual( result.popupafteropen.timedOut, false, "Did receive 'popupafteropen'" );
-			//select the first menu item
-			$( "#select-choice-few\\.dotTest-menu a:first" ).click();
-		},
+		var prefix = ".firingAClick";
+		$.testHelper.detailedEventCascade( [
+			function() {
 
-		{
-			timeout: { length: 1000 }
-		},
+				// Bring up the smaller choice menu
+				assert.ok( $( "#select-choice-few-container a" ).length > 0,
+					"there is in fact a button in the page" );
+				$( "#select-choice-few-container a" ).trigger( "click" );
+			},
 
-		function() {
-			deepEqual( $( "#select-choice-few\\.dotTest-menu" ).parent().parent( ".ui-popup-hidden" ).length, 1 );
-			start();
-		}
-	] );
-} );
+			{
+				popupafteropen: {
+					src: $( "#select-choice-few\\.dotTest-listbox" ),
+					event: "popupafteropen" + prefix
+				},
+				timeout: { length: 1000 }
+			},
 
-asyncTest( "a large select menu should use the default dialog transition", function() {
-	$.testHelper.pageSequence( [
-		resetHash,
+			function( result ) {
+				assert.strictEqual( result.popupafteropen.timedOut, false,
+					"Did receive 'popupafteropen'" );
 
-		function( timeout ) {
-			var select, old;
+				// Select the first menu item
+				$( "#select-choice-few\\.dotTest-menu a:first" ).click();
+			},
 
-			select = $( "#select-choice-many-container-1 a" );
+			{
+				timeout: { length: 1000 }
+			},
 
-			old = $.mobile.defaultTransitionHandler.prototype.transition;
+			function() {
+				assert.strictEqual( $( "#select-choice-few\\.dotTest-menu" )
+					.parent()
+					.parent( ".ui-popup-hidden" ).length, 1 );
+				QUnit.start();
+			}
+		] );
+	} );
 
-			//set to something else
-			$.mobile.defaultTransitionHandler.prototype.transition = function() {
-				// check that the instantiated transition handlers transition name
-				// property matches the default transition
-				deepEqual( this.name, $.mobile.defaultDialogTransition );
-				return old.apply( this, arguments );
-			};
+QUnit.asyncTest( "a large select menu should use the default dialog transition",
+	function( assert ) {
+		$.testHelper.pageSequence( [
+			resetHash,
 
-			// bring up the dialog
-			select.trigger( "click" );
-		},
+			function( timeout ) {
+				var select, old;
 
-		closeDialog,
+				select = $( "#select-choice-many-container-1 a" );
 
-		start
-	] );
-} );
+				old = $.mobile.defaultTransitionHandler.prototype.transition;
 
-asyncTest( "selecting an item from a dialog sized custom select menu leaves no dialog hash key", function() {
-	var dialogHashKey = "ui-state=dialog";
+				// Set to something else
+				$.mobile.defaultTransitionHandler.prototype.transition = function() {
 
-	$.testHelper.pageSequence( [
-		resetHash,
+					// Check that the instantiated transition handlers transition name property
+					// matches the default transition
+					assert.strictEqual( this.name, $.mobile.defaultDialogTransition );
+					return old.apply( this, arguments );
+				};
 
-		function( timeout ) {
-			$( "#select-choice-many-container-hash-check a" ).click();
-		},
+				// Bring up the dialog
+				select.trigger( "click" );
+			},
 
-		function() {
-			ok( location.hash.indexOf( dialogHashKey ) > -1 );
-			closeDialog();
-		},
+			closeDialog,
 
-		function() {
-			deepEqual( location.hash.indexOf( dialogHashKey ), -1 );
-			start();
-		}
-	] );
-} );
+			QUnit.start
+		] );
+	} );
 
-asyncTest( "dialog sized select menu opened many times remains a dialog", function() {
-	var dialogHashKey = "ui-state=dialog",
+QUnit.asyncTest( "selecting an item from a large custom select leaves no dialog hash key",
+	function( assert ) {
+		var dialogHashKey = "ui-state=dialog";
 
-		openDialogSequence = [
+		$.testHelper.pageSequence( [
 			resetHash,
 
-			function() {
-				$( "#select-choice-many-container-many-clicks a" ).click();
+			function( timeout ) {
+				$( "#select-choice-many-container-hash-check a" ).click();
 			},
 
 			function() {
-				ok( location.hash.indexOf( dialogHashKey ) > -1, "hash should have the dialog hash key" );
+				assert.ok( location.hash.indexOf( dialogHashKey ) > -1 );
 				closeDialog();
+			},
+
+			function() {
+				assert.strictEqual( location.hash.indexOf( dialogHashKey ), -1 );
+				QUnit.start();
 			}
-		],
+		] );
+	} );
 
-		sequence = openDialogSequence.concat( openDialogSequence ).concat( [ start ] );
+QUnit.asyncTest( "dialog sized select menu opened many times remains a dialog",
+	function( assert ) {
+		var dialogHashKey = "ui-state=dialog",
 
-	$.testHelper.sequence( sequence, 1000 );
-} );
+			openDialogSequence = [
+				resetHash,
 
-module( "Non native menus", {
+				function() {
+					$( "#select-choice-many-container-many-clicks a" ).click();
+				},
+
+				function() {
+					assert.ok( location.hash.indexOf( dialogHashKey ) > -1,
+						"hash should have the dialog hash key" );
+					closeDialog();
+				}
+			],
+
+			sequence = openDialogSequence.concat( openDialogSequence ).concat( [ start ] );
+
+		$.testHelper.sequence( sequence, 1000 );
+	} );
+
+QUnit.module( "Non native menus", {
 	setup: function() {
 		$.mobile.selectmenu.prototype.options.nativeMenu = false;
 	},
@@ -178,7 +198,8 @@ module( "Non native menus", {
 	}
 } );
 
-asyncTest( "a large select option should not overflow", function() {
+QUnit.asyncTest( "a large select option should not overflow", function( assert ) {
+
 	// https://github.com/jquery/jquery-mobile/issues/1338
 	var menu;
 
@@ -186,47 +207,54 @@ asyncTest( "a large select option should not overflow", function() {
 		resetHash,
 
 		function() {
-			// bring up the dialog
+
+			// Bring up the dialog
 			$( "#select-long-option-label" ).siblings( "a" ).trigger( "click" );
 		},
 
 		function() {
 			menu = $( "#select-long-option-label-menu.ui-selectmenu-list" );
 
-			equal( menu.outerWidth( true ), menu.find( "li:nth-child(2) a" ).outerWidth( true ), "a element should not overflow" );
-			start();
+			assert.equal( menu.outerWidth( true ),
+				menu.find( "li:nth-child(2) a" ).outerWidth( true ),
+				"a element should not overflow" );
+			QUnit.start();
 		}
 	], 500 );
 } );
 
-asyncTest( "focus is transferred to a menu item when the menu is opened", function() {
-	expect( 1 );
+QUnit.asyncTest( "focus is transferred to a menu item when the menu is opened",
+	function( assert ) {
+		assert.expect( 1 );
 
-	$.testHelper.sequence( [
-		resetHash,
+		$.testHelper.sequence( [
+			resetHash,
 
-		function() {
-			// bring up the dialog
-			$( "#select-choice-menu-focus-test a:first" ).trigger( "click" );
-		},
+			function() {
 
-		function() {
-			ok( $( document.activeElement ).parents( "#select-choice-menu-focus-test-menu" ).length > 0,
-				"item in open select menu (" + $( "#select-choice-menu-focus-test-menu" ).length + ") has focus" );
-			$( ".ui-popup-screen:not(.ui-screen-hidden)" ).trigger( "click" );
-		},
+				// Bring up the dialog
+				$( "#select-choice-menu-focus-test a:first" ).trigger( "click" );
+			},
 
-		function() {
-			start();
-		}
-	], 5000 );
-} );
+			function() {
+				assert.ok( $( document.activeElement )
+					.parents( "#select-choice-menu-focus-test-menu" ).length > 0,
+					"item in open select menu (" +
+						$( "#select-choice-menu-focus-test-menu" ).length + ") has focus" );
+				$( ".ui-popup-screen:not(.ui-screen-hidden)" ).trigger( "click" );
+			},
 
-asyncTest( "using custom refocuses the button after close", function() {
+			function() {
+				QUnit.start();
+			}
+		], 5000 );
+	} );
+
+QUnit.asyncTest( "using custom refocuses the button after close", function( assert ) {
 	var select, button,
 		triggered = false;
 
-	expect( 1 );
+	assert.expect( 1 );
 
 	$.testHelper.sequence( [
 		resetHash,
@@ -238,6 +266,7 @@ asyncTest( "using custom refocuses the button after close", function() {
 		},
 
 		function() {
+
 			// NOTE this is called twice per triggered click
 			button.focus( function() {
 				triggered = true;
@@ -247,97 +276,108 @@ asyncTest( "using custom refocuses the button after close", function() {
 		},
 
 		function() {
-			ok( triggered, "focus is triggered" );
-			start();
+			assert.ok( triggered, "focus is triggered" );
+			QUnit.start();
 		}
 	], 1500 );
 } );
 
-asyncTest( "selected items are highlighted", function() {
+QUnit.asyncTest( "selected items are highlighted", function( assert ) {
 	$.testHelper.sequence( [
 		resetHash,
 
 		function() {
-			// bring up the smaller choice menu
-			ok( $( "#select-choice-few-container a" ).length > 0, "there is in fact a button in the page" );
+
+			// Bring up the smaller choice menu
+			assert.ok( $( "#select-choice-few-container a" ).length > 0,
+				"there is in fact a button in the page" );
 			$( "#select-choice-few-container a" ).trigger( "click" );
 		},
 
 		function() {
 			var firstMenuChoice = $( "#select-choice-few\\.dotTest-menu li:first a" );
-			ok( firstMenuChoice.hasClass( "ui-button-active" ),
+
+			assert.hasClasses( firstMenuChoice, "ui-button-active",
 				"default menu choice has the active button class" );
 
 			$( "#select-choice-few\\.dotTest-menu a:last" ).click();
 		},
 
 		function() {
-			// bring up the menu again
+
+			// Bring up the menu again
 			$( "#select-choice-few-container a" ).trigger( "click" );
 		},
 
 		function() {
 			var lastMenuChoice = $( "#select-choice-few\\.dotTest-menu li:last a" );
-			ok( lastMenuChoice.hasClass( "ui-button-active" ),
+			assert.hasClasses( lastMenuChoice, "ui-button-active",
 				"previously selected item has the active button class" );
 
-			// close the dialog
+			// Close the dialog
 			lastMenuChoice.click();
 		},
 
-		start
+		QUnit.start
 	], 1000 );
 } );
 
-asyncTest( "adding options and refreshing a custom select changes the options list", function() {
-	var select = $( "#custom-refresh-opts-list" ),
-		button = select.siblings( "a" ),
-		text = "foo";
+QUnit.asyncTest( "adding options and refreshing a custom select changes the options list",
+	function( assert ) {
+		var select = $( "#custom-refresh-opts-list" ),
+			button = select.siblings( "a" ),
+			text = "foo";
 
-	$.testHelper.sequence( [
-		resetHash,
+		$.testHelper.sequence( [
+			resetHash,
 
-		// bring up the dialog
-		function() {
-			button.click();
-		},
+			// Bring up the dialog
+			function() {
+				button.click();
+			},
 
-		function() {
-			deepEqual( $( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(), "default" );
-			$( ".ui-popup-screen.in" ).click();
-		},
+			function() {
+				assert.strictEqual(
+					$( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(),
+					"default" );
+				$( ".ui-popup-screen.in" ).click();
+			},
 
-		function() {
-			select.find( "option" ).remove(); //remove the loading message
-			select.append( '<option value="1">' + text + '</option>' );
-			select.selectmenu( 'refresh' );
-		},
+			function() {
 
-		function() {
-			button.click();
-		},
+				// Remove the loading message
+				select.find( "option" ).remove();
+				select.append( "<option value='1'>" + text + "</option>" );
+				select.selectmenu( "refresh" );
+			},
 
-		function() {
-			deepEqual( $( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(), text );
-			$( ".ui-popup-screen.in" ).click();
-		},
+			function() {
+				button.click();
+			},
 
-		start
-	], 500 );
-} );
+			function() {
+				assert.strictEqual(
+					$( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(),
+					text );
+				$( ".ui-popup-screen.in" ).click();
+			},
+
+			QUnit.start
+		], 500 );
+	} );
 
-// issue #2547
-test( "custom select list item links have encoded option text values", function() {
-	$( "#encoded-option" ).data( 'mobile-selectmenu' )._buildList();
-	deepEqual( window.encodedValueIsDefined, undefined );
+// Issue #2547
+QUnit.test( "custom select list item links have encoded option text values", function( assert ) {
+	$( "#encoded-option" ).data( "mobile-selectmenu" )._buildList();
+	assert.strictEqual( window.encodedValueIsDefined, undefined );
 } );
 
-// not testing the positive case here since's it's obviously tested elsewhere
-test( "select elements in the keepNative set shouldn't be enhanced", function() {
-	ok( !$( "#keep-native" ).parent().is( "div.ui-button" ) );
+// Not testing the positive case here since's it's obviously tested elsewhere
+QUnit.test( "select elements in the keepNative set shouldn't be enhanced", function( assert ) {
+	assert.lacksClasses( $( "#keep-native" ).parent(), "ui-button" );
 } );
 
-asyncTest( "dialog size select title should match the label", function() {
+QUnit.asyncTest( "dialog size select title should match the label", function( assert ) {
 	var $select = $( "#select-choice-many-1\\.dotTest" ),
 		$label = $select.parent().siblings( "label" ),
 		$button = $select.siblings( "a" );
@@ -348,16 +388,16 @@ asyncTest( "dialog size select title should match the label", function() {
 		},
 
 		function() {
-			deepEqual( $.mobile.activePage.find( ".ui-title" ).text(), $label.text() );
+			assert.strictEqual( $.mobile.activePage.find( ".ui-title" ).text(), $label.text() );
 			window.history.back();
 		},
 
-		start
+		QUnit.start
 	] );
 } );
 
-asyncTest( "dialog size select title should match the placeholder when there's no label",
-	function() {
+QUnit.asyncTest( "dialog size select title should match the placeholder when there's no label",
+	function( assert ) {
 		var $select = $( "#select-choice-many-placeholder-1" ),
 			$label = $( "#select-choice-many-placeholder-1-listbox li:first" ),
 			$button = $select.siblings( "a" );
@@ -368,43 +408,57 @@ asyncTest( "dialog size select title should match the placeholder when there's n
 			},
 
 			function() {
-				deepEqual( $.mobile.activePage.find( ".ui-title" ).text(), $label.text() );
+				assert.strictEqual( $.mobile.activePage.find( ".ui-title" ).text(),
+					$label.text() );
 				window.history.back();
 			},
 
-			start
+			QUnit.start
 		] );
 	} );
 
-asyncTest( "dialog size select title should match the label when changed after the dialog markup is added to the DOM", function() {
-	var $select = $( "#select-choice-many-1\\.dotTest" ),
-		$label = $select.parent().siblings( "label" ),
-		$button = $select.siblings( "a" );
+QUnit.asyncTest( "dialog size select title should match the label when changed after the dialog " +
+	"markup is added to the DOM", function( assert ) {
+		var $select = $( "#select-choice-many-1\\.dotTest" ),
+			$label = $select.parent().siblings( "label" ),
+			$button = $select.siblings( "a" );
 
-	$.testHelper.detailedEventCascade( [
-		function() {
-			$label.text( "foo" );
-			$button.click();
-		},
+		$.testHelper.detailedEventCascade( [
+			function() {
+				$label.text( "foo" );
+				$button.click();
+			},
 
-		{ pagechange: { src: $.mobile.pageContainer, event: "pagechange.dialogSizeSelectTitleMod1" } },
+			{
+				pagechange: {
+					src: $.mobile.pageContainer,
+					event: "pagechange.dialogSizeSelectTitleMod1"
+				}
+			},
 
-		function() {
-			deepEqual( $.mobile.activePage.find( ".ui-title" ).text(), $label.text() );
-			window.history.back();
-		},
+			function() {
+				assert.strictEqual( $.mobile.activePage.find( ".ui-title" ).text(),
+					$label.text() );
+				window.history.back();
+			},
 
-		{ pagechange: { src: $.mobile.pageContainer, event: "pagechange.dialogSizeSelectTitleMod2" } },
+			{
+				pagechange: {
+					src: $.mobile.pageContainer,
+					event: "pagechange.dialogSizeSelectTitleMod2"
+				}
+			},
 
-		start
-	] );
-} );
+			QUnit.start
+		] );
+	} );
 
-asyncTest( "destroying a select menu leaves no traces", function() {
+QUnit.asyncTest( "destroying a select menu leaves no traces", function( assert ) {
 	$.testHelper.pageSequence( [
 		function() {
 			$.mobile.changePage( "#destroyTest" );
 		},
+
 		// Check if two chunks of DOM are identical
 		function() {
 			var unenhancedSelect = $(
@@ -420,19 +474,21 @@ asyncTest( "destroying a select menu leaves no traces", function() {
 			unenhancedSelectClone.selectmenu( "destroy" );
 			unenhancedSelectClone.remove();
 
-			deepEqual( $( "#destroyTest" ).children().length, 0, "After adding, enhancing, destroying, and removing the select menu, the page is empty" );
-			ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ), "DOM for select after enhancement/destruction is equal to DOM for unenhanced select" );
+			assert.strictEqual( $( "#destroyTest" ).children().length, 0,
+				"After adding/enhancing/destroying/removing the select menu, the page is empty" );
+			assert.ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ),
+				"DOM for select after enhancement/destruction is equal to unenhanced select DOM" );
 		},
 		function() {
 			$.mobile.back();
 		},
 
-		start
+		QUnit.start
 	] );
 } );
 
-asyncTest( "destroying a custom select menu leaves no traces", function() {
-	expect( 7 );
+QUnit.asyncTest( "destroying a custom select menu leaves no traces", function( assert ) {
+	assert.expect( 7 );
 
 	var unenhancedSelectClone,
 		prefix = ".destroyingASelectMenuLeavesNoTraces",
@@ -465,7 +521,7 @@ asyncTest( "destroying a custom select menu leaves no traces", function() {
 		},
 
 		function( result ) {
-			deepEqual( result.popupafteropen.timedOut, false, "Popup did open" );
+			assert.strictEqual( result.popupafteropen.timedOut, false, "Popup did open" );
 			$( "#" + id + "-listbox" ).popup( "close" );
 		},
 
@@ -476,18 +532,22 @@ asyncTest( "destroying a custom select menu leaves no traces", function() {
 		function( result ) {
 			var idx;
 
-			deepEqual( result.popupafterclose.timedOut, false, "Popup did close" );
+			assert.strictEqual( result.popupafterclose.timedOut, false, "Popup did close" );
 
 			unenhancedSelectClone.selectmenu( "destroy" );
 			unenhancedSelectClone.remove();
 
-			deepEqual( $( "#destroyTest" ).children().length, 0, "After adding, enhancing, opening, destroying, and removing the popup-sized select menu, the page is empty" );
-			ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ), "DOM for select after enhancement/destruction is equal to DOM for unenhanced select" );
+			assert.strictEqual( $( "#destroyTest" ).children().length, 0,
+				"After adding, enhancing, opening, destroying, and removing the popup-sized " +
+				"select menu, the page is empty" );
+			assert.ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ),
+				"DOM for select after enhancement/destruction is equal to unenhanced select DOM" );
 
-			// Add a bunch of options to make sure the menu ends up larger than
-			// the screen, thus requiring a dialog
+			// Add a bunch of options to make sure the menu ends up larger than the screen, thus
+			// requiring a dialog
 			for ( idx = 3; idx < 60; idx++ ) {
-				unenhancedSelect.append( "<option value='option" + idx + "'>Option " + idx + "</option>" );
+				unenhancedSelect.append( "<option value='option" + idx + "'>Option " + idx +
+					"</option>" );
 			}
 			unenhancedSelectClone = unenhancedSelect.clone();
 			$( "#destroyTest" ).append( unenhancedSelectClone );
@@ -500,6 +560,7 @@ asyncTest( "destroying a custom select menu leaves no traces", function() {
 		},
 
 		function() {
+
 			// Close the dialog
 			$.mobile.activePage.find( "a:first" ).click();
 		},
@@ -512,9 +573,14 @@ asyncTest( "destroying a custom select menu leaves no traces", function() {
 			unenhancedSelectClone.selectmenu( "destroy" );
 			unenhancedSelectClone.remove();
 
-			deepEqual( $( "#destroyTest" ).children().length, 0, "After adding, enhancing, opening, destroying, and removing the dialog-sized select menu, the page is empty" );
-			ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ), "DOM for select after enhancement/destruction is equal to DOM for unenhanced select" );
-			deepEqual( $( "#" + id + "-dialog" ).length, 0, "After adding, enhancing, opening, destroying, and removing the dialog-sized select menu, no dialog page is left behind" );
+			assert.strictEqual( $( "#destroyTest" ).children().length, 0,
+				"After adding, enhancing, opening, destroying, and removing the dialog-sized " +
+				"select menu, the page is empty" );
+			assert.ok( $.testHelper.domEqual( unenhancedSelect, unenhancedSelectClone ),
+				"DOM for select after enhancement/destruction is equal to unenhanced select DOM" );
+			assert.strictEqual( $( "#" + id + "-dialog" ).length, 0,
+				"After adding, enhancing, opening, destroying, and removing the dialog-sized " +
+				"select menu, no dialog page is left behind" );
 			$.mobile.back();
 		},
 
@@ -522,13 +588,13 @@ asyncTest( "destroying a custom select menu leaves no traces", function() {
 			pagechange: { src: $.mobile.pageContainer, event: "pagechange" + prefix + "5" }
 		},
 
-		start
+		QUnit.start
 	] );
 } );
 
-asyncTest( "Custom select passes overlay theme to its dialog", function() {
+QUnit.asyncTest( "Custom select passes overlay theme to its dialog", function( assert ) {
 
-	expect( 2 );
+	assert.expect( 2 );
 
 	var dialog,
 		eventNs = ".passesOnOverlayThemeToDialog";
@@ -539,14 +605,13 @@ asyncTest( "Custom select passes overlay theme to its dialog", function() {
 		},
 		function() {
 			dialog = $( "#select-choice-many-overlay-theme-test-dialog" );
-			deepEqual(
-				$( ":mobile-pagecontainer" ).hasClass( "ui-overlay-x" ),
-				true, "Page container has appropriate theme." );
-			deepEqual( dialog.dialog( "option", "overlayTheme" ), "x",
+			assert.hasClasses( $( ":mobile-pagecontainer" ), "ui-overlay-x",
+				"Page container has appropriate theme." );
+			assert.strictEqual( dialog.page( "option", "overlayTheme" ), "x",
 				"Dialog widget overlayTheme option is correct." );
-			dialog.dialog( "close" );
+			$.mobile.back();
 		},
-		start
+		QUnit.start
 	] );
 } );
 
@@ -562,7 +627,7 @@ var callLog, origTrigger,
 		return origTrigger.apply( this, arguments );
 	};
 
-module( "Custom select change comes after closing list", {
+QUnit.module( "Custom select change comes after closing list", {
 	setup: function() {
 		callLog = [];
 		origTrigger = $.event.trigger;
@@ -573,7 +638,7 @@ module( "Custom select change comes after closing list", {
 	}
 } );
 
-function testChangeAfterClose( select, ns, openEvent, closeEvent, tail ) {
+function testChangeAfterClose( assert, select, ns, openEvent, closeEvent, tail ) {
 	var closeComesBeforeChange = false,
 		closeEventName = closeEvent.event;
 
@@ -615,15 +680,15 @@ function testChangeAfterClose( select, ns, openEvent, closeEvent, tail ) {
 				}
 			} );
 
-			deepEqual( closeComesBeforeChange, true,
+			assert.strictEqual( closeComesBeforeChange, true,
 				"close event is triggered before change event" );
 			tail();
 		}
 	] );
 }
 
-asyncTest( "Small select triggers change after popup closes", function() {
-	testChangeAfterClose( $( "#small-select-change-after-close" ),
+QUnit.asyncTest( "Small select triggers change after popup closes", function( assert ) {
+	testChangeAfterClose( assert, $( "#small-select-change-after-close" ),
 		".smallSelectTriggersChangeAfterPopupCloses",
 		{
 			src: $( "#small-select-change-after-close-listbox" ),
@@ -632,11 +697,11 @@ asyncTest( "Small select triggers change after popup closes", function() {
 		{
 			src: $( "#small-select-change-after-close-listbox" ),
 			event: "popupafterclose"
-		}, start );
+		}, QUnit.start );
 } );
 
-asyncTest( "Large select triggers change after dialog closes", function() {
-	testChangeAfterClose( $( "#large-select-change-after-close" ),
+QUnit.asyncTest( "Large select triggers change after dialog closes", function( assert ) {
+	testChangeAfterClose( assert, $( "#large-select-change-after-close" ),
 		".largeSelectTriggersChangeAfterPopupCloses",
 		{ src: $( document ), event: "pageshow" },
 		{
@@ -645,7 +710,7 @@ asyncTest( "Large select triggers change after dialog closes", function() {
 			},
 			event: "pagehide"
 		},
-		start );
+		QUnit.start );
 } );
 
-} )( jQuery );
+} )( QUnit, jQuery );
diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js
index 4352ddf3b86..27315b850d2 100644
--- a/tests/jquery.testHelper.js
+++ b/tests/jquery.testHelper.js
@@ -392,14 +392,14 @@ $.testHelper = {
 		};
 	},
 
-	assertUrlLocation: function( args ) {
+	assertUrlLocation: function( assert, args ) {
 		var parts = $.mobile.path.parseUrl( location.href ),
 			pathnameOnward = location.href.replace( parts.domain, "" );
 
 		if ( $.support.pushState ) {
-			deepEqual( pathnameOnward, args.hashOrPush || args.push, args.report );
+			assert.deepEqual( pathnameOnward, args.hashOrPush || args.push, args.report );
 		} else {
-			deepEqual( parts.hash, "#" + ( args.hashOrPush || args.hash ), args.report );
+			assert.deepEqual( parts.hash, "#" + ( args.hashOrPush || args.hash ), args.report );
 		}
 	},
 
diff --git a/tests/unit/dialog/dialog_count.js b/tests/unit/dialog/dialog_count.js
deleted file mode 100644
index 98125b7cbe3..00000000000
--- a/tests/unit/dialog/dialog_count.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * mobile dialog unit tests
- */
-( function( QUnit, $ ) {
-QUnit.test( "When the page loads, any dialogs in the page should be initialized", function( assert ) {
-	assert.expect( 1 );
-
-	assert.ok( $( "#foo-dialog" ).is( ".ui-dialog" ), "When a dialog is the first element in a page, it is created as a dialog widget." );
-} );
-} )( QUnit, jQuery );
diff --git a/tests/unit/init/dialog-load-tests.html b/tests/unit/init/dialog-load-tests.html
index 1203490f884..7004e567a0d 100644
--- a/tests/unit/init/dialog-load-tests.html
+++ b/tests/unit/init/dialog-load-tests.html
@@ -7,14 +7,12 @@
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script type="text/javascript" src="../../../js/"></script>
 	<script type="text/javascript" src="init_dialog.js"></script>
-	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
+	<link rel="stylesheet"href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
-	</script>
 </head>
 <body>
 
diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html
index 17ad428bff5..bb47af3303c 100644
--- a/tests/unit/init/index.html
+++ b/tests/unit/init/index.html
@@ -11,18 +11,18 @@
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
+	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
     <script src="../../../external/qunit/qunit.js"></script>
+    <script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
     <script>
+		$.mobileBackcompat = false;
 		QUnit.config.autostart = false;
 
-        $.testHelper.asyncLoad([
-            [ "tests/unit/init/init_core" ]
-        ]);
+		$.testHelper.asyncLoad( [
+			[ "tests/unit/init/init_core" ]
+		] );
     </script>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
diff --git a/tests/unit/init/init_dialog.js b/tests/unit/init/init_dialog.js
index f5c1e458f2d..92882a5f933 100644
--- a/tests/unit/init/init_dialog.js
+++ b/tests/unit/init/init_dialog.js
@@ -4,11 +4,15 @@
 ( function( QUnit, $ ) {
 QUnit.module( "jquery.mobile.init dialog load tests" );
 
-// issue #3275
-QUnit.test( "A document containing no pages and a dialog role div will enhance the div as a dialog", function( assert ) {
-	// NOTE this will fail when/if we decide to render it as a dialog
-	assert.ok( $( "#foo" ).hasClass( "ui-dialog" ), "the div does NOT have the dialog page class" );
-} );
+// Issue #3275
+QUnit.test(
+	"A document containing no pages and a dialog role div will enhance the div as a dialog",
+	function( assert ) {
 
-//NOTE the opposite case is tested everyewhere else in the suite :D
-} )( QUnit, jQuery );
\ No newline at end of file
+		// NOTE this will fail when/if we decide to render it as a dialog
+		assert.hasClasses( $( "#foo" ), "ui-page-dialog",
+			"the div does NOT have the dialog page class" );
+	} );
+
+// NOTE the opposite case is tested everyewhere else in the suite :D
+} )( QUnit, jQuery );
diff --git a/tests/unit/dialog/index.html b/tests/unit/page/dialog-tests.html
similarity index 57%
rename from tests/unit/dialog/index.html
rename to tests/unit/page/dialog-tests.html
index 45472521341..9a31f23d8df 100644
--- a/tests/unit/dialog/index.html
+++ b/tests/unit/page/dialog-tests.html
@@ -7,52 +7,36 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script>
-		$(document).bind('mobileinit',function(){
-			// Expect content to inherit this theme when not explicitly set
-			$.mobile.page.prototype.options.contentTheme = "d";
-		});
-	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
 	<script>
-		$.testHelper.asyncLoad([
-			[
-				"widgets/dialog",
-				"widgets/page"
-			],
+		$.testHelper.asyncLoad( [
+			[ "widgets/page.dialog" ],
 			[ "init" ],
-			[
-				"dialog_count.js"
-			]
-		]);
+			[ "dialog_count.js" ]
+		] );
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-
-	<script src="../../swarminject.js"></script>
 </head>
 <body>
 
 	<div id="qunit"></div>
-
-	<div id="qunit-fixture">
-
-		<div id="foo-dialog" data-nstest-role="dialog" data-nstest-theme="b">
-			<div  data-nstest-role="header">
-				<h1>Dialog</h1>
-			</div>
-			<div data-nstest-role="content" >
-
-			</div>
-			<div data-nstest-role="footer">
-				footer
-			</div>
+	<pre><code id="console"></code></pre>
+	<div id="foo-dialog" data-nstest-dialog="true" data-nstest-role="dialog" data-nstest-theme="b">
+		<div  data-nstest-role="header">
+			<h1>Dialog</h1>
 		</div>
+		<div data-nstest-role="content" >
 
+		</div>
+		<div data-nstest-role="footer">
+			footer
+		</div>
 	</div>
 
 </body>
diff --git a/tests/unit/page/dialog_count.js b/tests/unit/page/dialog_count.js
new file mode 100644
index 00000000000..419b7a19618
--- /dev/null
+++ b/tests/unit/page/dialog_count.js
@@ -0,0 +1,12 @@
+/*
+ * mobile dialog unit tests
+ */
+( function( QUnit, $ ) {
+QUnit.test( "When the page loads, any dialogs in the page should be initialized",
+	function( assert ) {
+		assert.expect( 1 );
+
+		assert.hasClasses( $( "#foo-dialog" ), "ui-page-dialog",
+			"When a dialog is the first element in a page, it is created as a dialog widget." );
+	} );
+} )( QUnit, jQuery );
diff --git a/tests/unit/pagecontainer/pagecontainer_core.js b/tests/unit/pagecontainer/pagecontainer_core.js
index 92b4ba0368a..175a459b56a 100644
--- a/tests/unit/pagecontainer/pagecontainer_core.js
+++ b/tests/unit/pagecontainer/pagecontainer_core.js
@@ -1,15 +1,15 @@
 test( "_find() can handle weird data-url attributes", function() {
-deepEqual(
-	$.mobile.pagecontainer.prototype._find.call( {
-		_createFileUrl: $.mobile.pagecontainer.prototype._createFileUrl,
-		_createDataUrl: $.mobile.pagecontainer.prototype._createDataUrl,
-		_getInitialContent: $.mobile.pagecontainer.prototype._getInitialContent,
-		element: $( "body" ),
-		_getNs: $.mobile.pagecontainer.prototype._getNs,
+	deepEqual(
+		$.mobile.pagecontainer.prototype._find.call( {
+			_createFileUrl: $.mobile.pagecontainer.prototype._createFileUrl,
+			_createDataUrl: $.mobile.pagecontainer.prototype._createDataUrl,
+			_getInitialContent: $.mobile.pagecontainer.prototype._getInitialContent,
+			element: $( "body" ),
+			_getNs: $.mobile.pagecontainer.prototype._getNs
 
-	}, "Raison d'être.html" )[ 0 ],
-	$( ".weird-data-url" )[ 0 ],
-	"Correct element is retrieved when the file name is weird" );
+		}, "Raison d'être.html" )[ 0 ],
+		$( ".weird-data-url" )[ 0 ],
+		"Correct element is retrieved when the file name is weird" );
 } );
 
 ( function() {
@@ -51,38 +51,39 @@ test( "Options 'reload' and 'reloadPage' both work, and 'reload' takes precedenc
 		reloadPage: false
 	} );
 
-	deepEqual( triggerData.options.reload, true,
+	strictEqual( triggerData.options.reload, true,
 		"The value of option 'reload' is not affected by the value of option 'reloadPage'" );
 
 	pagecontainer.pagecontainer( "load", "stuff.html", {
 		reloadPage: true
 	} );
 
-	deepEqual( triggerData.options.reload, true,
+	strictEqual( triggerData.options.reload, true,
 		"The value of option 'reloadPage' is copied to the value of option 'reload' if the " +
 		"latter is absent from the options hash" );
 } );
 
 module( "_handleDialog()" );
 
-test( "A dialog is recognized via presence of the data key, not the ui-dialog class", function() {
+test( "Recognize dialog via presence of the data key, not the ui-page-dialog class", function() {
 	var getActiveHistoryCalled = false;
 
-	deepEqual( $.mobile.pagecontainer.prototype._handleDialog.call( {
+	strictEqual( $.mobile.pagecontainer.prototype._handleDialog.call( {
 		getActivePage: function() {
-			return $( "<div class='ui-dialog'></div>" );
+			return $( "<div class='ui-page-dialog'></div>" );
 		},
 		_getActiveHistory: function() {
 			getActiveHistoryCalled = true;
 			return {};
 		},
 		back: $.noop,
-		forward: $.noop,
+		forward: $.noop
 	}, {}, {
 		pageUrl: "xyzzy.html"
-	} ), false, "page is recognized as page even when the ui-dialog class is present" );
+	} ), false, "page is recognized as page even when the ui-page-dialog class is present" );
 
-	deepEqual( getActiveHistoryCalled, false, "_getActiveHistory() should not have been called" );
+	strictEqual( getActiveHistoryCalled, false,
+		"_getActiveHistory() should not have been called" );
 } );
 
 } )();