diff --git a/RoboFile.php b/RoboFile.php
index ffa21c1f9ec..cdcb4cb52dd 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -64,7 +64,7 @@ public function testsSitePreparation($use_htaccess = 1, $cleanUp = 1)
 			* When joomla Staging branch has a bug you can uncomment the following line as a tmp fix for the tests layer.
 			* Use as $version value the latest tagged stable version at: https://github.com/joomla/joomla-cms/releases
 			*/
-			$version = '3.9.22';
+			$version = '3.9.23';
 
 			$this->_exec("git clone -b $version --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/joomla-cms");
 			$this->say("Joomla CMS ($version) site created at tests/joomla-cms");
diff --git a/tests/acceptance/administrator/_steps/Joomla3Steps/Configuration/ConfigurationSteps.php b/tests/acceptance/administrator/_steps/Joomla3Steps/Configuration/ConfigurationSteps.php
index 21f688f7478..ec163f0833e 100644
--- a/tests/acceptance/administrator/_steps/Joomla3Steps/Configuration/ConfigurationSteps.php
+++ b/tests/acceptance/administrator/_steps/Joomla3Steps/Configuration/ConfigurationSteps.php
@@ -797,7 +797,7 @@ public function ConfigurationOder($configurationOder = array())
 			$I->wait(2);
 			$I->canSeeInPopup(ConfigurationPage::$alertMessageResetID);
 			$I->acceptPopup();
-			$I->wait(2);
+			$I->wait(3);
 			$I->canSeeInPopup(ConfigurationPage::$messagePopup);
 			$I->seeInPopup(ConfigurationPage::$messagePopup);
 			$I->acceptPopup();
diff --git a/tests/acceptance/administrator/_steps/Joomla3Steps/OrderManagerJoomla3Steps.php b/tests/acceptance/administrator/_steps/Joomla3Steps/OrderManagerJoomla3Steps.php
index e681cc2847a..953c111841f 100644
--- a/tests/acceptance/administrator/_steps/Joomla3Steps/OrderManagerJoomla3Steps.php
+++ b/tests/acceptance/administrator/_steps/Joomla3Steps/OrderManagerJoomla3Steps.php
@@ -400,7 +400,7 @@ public function addOrderWithVATWithUserForeignCountry($nameUser, $function, $vat
 
 		$I->waitForJS("return window.jQuery && jQuery.active == 0;", 30);
 		$I->waitForElementVisible($userOrderPage->returnXpathAttributeValue($product['size']), 30);
-		$I->wait(0.5);
+		$I->wait(1);
 		$I->seeElement($userOrderPage->returnXpathAttributeName($product['attributeName']));
 		$I->click($userOrderPage->returnXpathAttributeValue($product['size']));
 		$I->waitForJs('return document.readyState == "complete"', 10);
diff --git a/tests/acceptance/administrator/_steps/Joomla3Steps/ProductCheckoutManagerJoomla3Steps.php b/tests/acceptance/administrator/_steps/Joomla3Steps/ProductCheckoutManagerJoomla3Steps.php
index 03ad392ee25..5dce6b37aad 100644
--- a/tests/acceptance/administrator/_steps/Joomla3Steps/ProductCheckoutManagerJoomla3Steps.php
+++ b/tests/acceptance/administrator/_steps/Joomla3Steps/ProductCheckoutManagerJoomla3Steps.php
@@ -116,6 +116,7 @@ public function addressInformation($addressDetail)
 		$I->click(FrontEndProductManagerJoomla3Page::$countryCode1);
 
 		$I->waitForElementVisible(FrontEndProductManagerJoomla3Page::$searchCountryInput, 30);
+		$I->click(FrontEndProductManagerJoomla3Page::$searchCountryInput);
 		$I->fillField(FrontEndProductManagerJoomla3Page::$searchCountryInput, $addressDetail['country']);
 		$I->wait(0.5);
 		$I->pressKey(FrontEndProductManagerJoomla3Page::$searchCountryInput, \Facebook\WebDriver\WebDriverKeys::ENTER);