@@ -4,6 +4,9 @@
 
 namespace PhpMyAdmin\Tests\Selenium;
 
+use function bin2hex;
+use function random_bytes;
+
 /**
  * @coversNothing
  */
@@ -37,7 +40,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->skipIfNotSuperUser();
-        $this->txtUsername = 'pma_user';
+        $this->txtUsername = 'test_user_' . bin2hex(random_bytes(4));
         $this->txtPassword = 'abc_123';
         $this->login();
     }
@@ -102,7 +105,7 @@ public function testCreateRemoveUser(): void
         $this->byId('dropUsersDbCheckbox')->click();
 
         $this->byId('buttonGo')->click();
-        $this->waitForElement('cssSelector', 'button.submitOK')->click();
+        $this->waitForElement('id', 'functionConfirmOkButton')->click();
         $this->acceptAlert();
 
         $success = $this->waitForElement('cssSelector', '.alert-success');
 
@@ -49,7 +49,7 @@ public function testTruncateTable(): void
     {
         $this->byXPath("(//a[contains(., 'Empty')])[1]")->click();
 
-        $this->waitForElement('cssSelector', 'button.submitOK')->click();
+        $this->waitForElement('id', 'functionConfirmOkButton')->click();
 
         $this->assertNotNull(
             $this->waitForElement(
 
@@ -21,6 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use Throwable;
 
+use function bin2hex;
 use function curl_close;
 use function curl_errno;
 use function curl_error;
@@ -36,12 +37,9 @@
 use function json_decode;
 use function json_encode;
 use function mb_strtolower;
-use function mb_substr;
-use function mt_getrandmax;
 use function preg_match;
-use function random_int;
+use function random_bytes;
 use function reset;
-use function sha1;
 use function sprintf;
 use function strlen;
 use function substr;
@@ -159,7 +157,7 @@ protected function setUp(): void
      */
     protected function createDatabase(): void
     {
-        $this->databaseName = $this->getDbPrefix() . mb_substr(sha1((string) random_int(0, mt_getrandmax())), 0, 7);
+        $this->databaseName = $this->getDbPrefix() . bin2hex(random_bytes(4));
         $this->dbQuery(
             'CREATE DATABASE IF NOT EXISTS `' . $this->databaseName . '`; USE `' . $this->databaseName . '`;'
         );
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function testTruncateTable(): void`
`49`	`49`	`{`
`50`	`50`	`$this->byXPath("(//a[contains(., 'Empty')])[1]")->click();`
`51`	`51`
`52`		`- $this->waitForElement('cssSelector', 'button.submitOK')->click();`
	`52`	`+ $this->waitForElement('id', 'functionConfirmOkButton')->click();`
`53`	`53`
`54`	`54`	`$this->assertNotNull(`
`55`	`55`	`$this->waitForElement(`