diff --git a/ext/index/test.php b/ext/index/test.php
index c4f63ec3..509ab7ff 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -23,7 +23,7 @@ class IndexTest extends ShimmieWebTestCase {
 		$this->assert_title("Shimmie");
 
 		$this->get_page('post/list/99999');
-		$this->assert_title("Shimmie");
+		$this->assert_title("No Images Found");
 
 		$this->log_in_as_admin();
 		$this->delete_image($image_id);
@@ -44,7 +44,7 @@ class IndexTest extends ShimmieWebTestCase {
 
 		# regular tag, no results
 		$this->get_page('post/list/maumaumau/1');
-		$this->assert_title("maumaumau");
+		$this->assert_title("No Images Found");
 		$this->assert_text("No Images Found");
 
 		# regular tag, many results
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index 79ac50fb..82953f5a 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -51,10 +51,10 @@ class TagEditTest extends ShimmieWebTestCase {
 		$this->assert_title("Image $image_id: pbx");
 
 		$this->get_page("admin");
-		$this->assert_text("Mass Tag Edit"); // just test it exists
+		$this->assert_text("Mass Tag Edit");
 		$this->set_field("search", "pbx");
 		$this->set_field("replace", "pox");
-		$this->click("Set");
+		$this->click("Replace");
 
 		$this->get_page("post/view/$image_id");
 		$this->assert_title("Image $image_id: pox");