diff --git a/tests/unit/navigation/index.html b/tests/unit/navigation/index.html
index 27c0f7ad..b15334d0 100644
--- a/tests/unit/navigation/index.html
+++ b/tests/unit/navigation/index.html
@@ -247,6 +247,17 @@
     </div>
 </div>
 
+<div id="active-state-page1" data-nstest-role="page">
+	<div data-nstest-role="content">
+		<a href="#active-state-page2" data-nstest-role="button">page2</a>
+	</div>
+</div>
 
+<div id="active-state-page2" data-nstest-role="page">
+	<div data-nstest-role="content">
+		<a href="#active-state-page1" data-nstest-role="button">href button</a>
+		<a href="#active-state-page1" data-nstest-rel="back" data-nstest-role="button">back button</a>
+	</div>
+</div>
 </body>
 </html>
diff --git a/tests/unit/navigation/navigation_core.js b/tests/unit/navigation/navigation_core.js
index ce46e0d1..ac789616 100644
--- a/tests/unit/navigation/navigation_core.js
+++ b/tests/unit/navigation/navigation_core.js
@@ -608,4 +608,55 @@
 			}
 		]);
 	});
+
+	asyncTest( "handling of active button state when navigating", 1, function(){
+
+		$.testHelper.pageSequence([
+			// open our test page
+			function(){
+				$.testHelper.openPage("#active-state-page1");
+			},
+
+			function(){
+				$("#active-state-page1 a").eq(0).click();
+			},
+
+			function(){
+				$("#active-state-page2 a").eq(0).click();
+			},
+
+			function(){
+				ok(!$("#active-state-page1 a").hasClass( $.mobile.activeBtnClass ), "No button should not have class " + $.mobile.activeBtnClass );
+				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");
+			},
+
+			function(){
+				$("#active-state-page1 a").eq(0).click();
+			},
+
+			function(){
+				$("#active-state-page2 a").eq(1).click();
+			},
+
+			function(){
+				$("#active-state-page1 a").eq(0).click();
+			},
+
+			function(){
+				ok(!$("#active-state-page2 a").hasClass( $.mobile.activeBtnClass ), "No button should not have class " + $.mobile.activeBtnClass );
+				start();
+			}
+		]);
+	});
+
 })(jQuery);