diff --git a/test/bootstrap-static.php b/test/bootstrap-static.php
index 086b2f9b9c..fbbd7023ff 100644
--- a/test/bootstrap-static.php
+++ b/test/bootstrap-static.php
@@ -30,7 +30,7 @@ $GLOBALS['server'] = 0;
 define('PMA_PATH_TO_BASEDIR', '');
 define('PMA_USR_BROWSER_AGENT', 'CHROME');
 define('PMA_USR_BROWSER_VER', 1);
-define('PMA_USR_OS', 'os');
+define('PMA_USR_OS', 'Other');
 define('PMA_IS_WINDOWS', false);
 // phpcs:enable
 
diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php
index 0e4baacf1e..72faaea70c 100644
--- a/test/classes/ErrorReportTest.php
+++ b/test/classes/ErrorReportTest.php
@@ -11,8 +11,6 @@ use PhpMyAdmin\Template;
 use PhpMyAdmin\Utils\HttpRequest;
 use PhpMyAdmin\Version;
 
-use function define;
-use function defined;
 use function htmlspecialchars;
 use function json_encode;
 use function phpversion;
@@ -41,18 +39,7 @@ class ErrorReportTest extends AbstractTestCase
         $_SERVER['HTTP_USER_AGENT'] = 'HTTP_USER_AGENT';
         $_COOKIE['pma_lang'] = 'en';
         $GLOBALS['config']->set('is_https', false);
-
-        if (! defined('PMA_USR_BROWSER_AGENT')) {
-            define('PMA_USR_BROWSER_AGENT', 'Other');
-        }
-
-        if (! defined('PMA_USR_BROWSER_VER')) {
-            define('PMA_USR_BROWSER_VER', 1);
-        }
-
-        if (! defined('PMA_USR_OS')) {
-            define('PMA_USR_OS', 'os');
-        }
+        $GLOBALS['config']->enableBc();
 
         $template = new Template();
         $this->errorReport = new ErrorReport(
diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php
index 558416be73..0191e49d0d 100644
--- a/test/classes/NormalizationTest.php
+++ b/test/classes/NormalizationTest.php
@@ -142,10 +142,19 @@ class NormalizationTest extends AbstractTestCase
         $GLOBALS['cfg']['BrowseMIME'] = true;
         $GLOBALS['cfg']['MaxRows'] = 25;
         $GLOBALS['col_priv'] = false;
-        $db = 'PMA_db';
-        $table = 'PMA_table';
+        $GLOBALS['cfg']['Server']['DisableIS'] = false;
+        $GLOBALS['dbi'] = $this->dbi;
+        $db = 'testdb';
+        $table = 'mytable';
         $numFields = 1;
-        $result = $this->normalization->getHtmlForCreateNewColumn($numFields, $db, $table);
+        $template = new Template();
+        $normalization = new Normalization(
+            $this->dbi,
+            new Relation($this->dbi, $template),
+            new Transformations(),
+            $template
+        );
+        $result = $normalization->getHtmlForCreateNewColumn($numFields, $db, $table);
         $this->assertStringContainsString(
             '<table id="table_columns"',
             $result
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index 88539e4dd9..afeddf002e 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -1845,6 +1845,7 @@ class PrivilegesTest extends AbstractTestCase
      */
     public function testGetHtmlForUserOverview(): void
     {
+        $_REQUEST = ['ajax_page_request' => '1'];
         $actual = $this->serverPrivileges->getHtmlForUserOverview('ltr');
         $this->assertStringContainsString(
             'Note: MySQL privilege names are expressed in English.',
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 92fd9e1e0d..cb955bc605 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -8,6 +8,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\FieldMetadata;
 use PhpMyAdmin\MoTranslator\Loader;
+use PhpMyAdmin\Response;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Token;
 use PhpMyAdmin\Util;
@@ -343,6 +344,7 @@ class UtilTest extends AbstractTestCase
     public function testCheckParameterMissing(): void
     {
         parent::setGlobalConfig();
+        $_REQUEST = [];
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
         $GLOBALS['db'] = 'db';
@@ -350,6 +352,7 @@ class UtilTest extends AbstractTestCase
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $GLOBALS['cfg']['AllowThirdPartyFraming'] = false;
+        Response::getInstance()->setAjax(false);
 
         $this->expectOutputRegex('/Missing parameter: field/');
 
diff --git a/test/phpstan-constants.php b/test/phpstan-constants.php
index 9ccdab627e..adc125fabc 100644
--- a/test/phpstan-constants.php
+++ b/test/phpstan-constants.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
 define('PMA_USR_BROWSER_AGENT', 'Other');
 define('PMA_USR_BROWSER_VER', 1);
-define('PMA_USR_OS', 'os');
+define('PMA_USR_OS', 'Other');
 define('PMA_IS_WINDOWS', false);
 define('CACHE_DIR', ROOT_PATH . 'libraries' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR);
 define('VERSION_SUFFIX', '');