diff --git a/tests/functional/pages/catalog/CatalogSearchTest.php b/tests/functional/pages/catalog/CatalogSearchTest.php
index 59c462759d3..43b27345773 100644
--- a/tests/functional/pages/catalog/CatalogSearchTest.php
+++ b/tests/functional/pages/catalog/CatalogSearchTest.php
@@ -29,9 +29,9 @@ protected function getAffectedTables() {
 	function testBombSearch() {
 		// Search for "bomb"
 		$this->open(self::$baseUrl);
-		$this->waitForElementPresent($selector = '//form[contains(@class, \'cmp_search_homepage\')]//input[@name=\'query\']');
+		$this->waitForElementPresent($selector = '//form[contains(@class, \'pkp_search\')]//input[@name=\'query\']');
 		$this->type($selector, 'bomb');
-		$this->click('//form[contains(@class, \'cmp_search_homepage\')]//button[contains(.,\'Search Catalog\')]');
+		$this->click('//form[contains(@class, \'pkp_search\')]//button[contains(.,\'Search\')]');
 
 		// Should be 1 result
 		$this->waitForElementPresent('//div[contains(.,\'1 Titles\')]');
@@ -44,9 +44,9 @@ function testBombSearch() {
 	function testZorgSearch() {
 		// Search for "bomb"
 		$this->open(self::$baseUrl);
-		$this->waitForElementPresent($selector = '//form[contains(@class, \'cmp_search_homepage\')]//input[@name=\'query\']');
+		$this->waitForElementPresent($selector = '//form[contains(@class, \'pkp_search\')]//input[@name=\'query\']');
 		$this->type($selector, 'zorg');
-		$this->click('//form[contains(@class, \'cmp_search_homepage\')]//button[contains(.,\'Search Catalog\')]');
+		$this->click('//form[contains(@class, \'pkp_search\')]//button[contains(.,\'Search\')]');
 
 		// Should be 0 results
 		$this->waitForElementPresent('//div[contains(.,\'0 Titles\')]');