diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
index bb23028bbf..d3b8f03dd7 100644
--- a/test/classes/AbstractTestCase.php
+++ b/test/classes/AbstractTestCase.php
@@ -125,11 +125,6 @@ abstract class AbstractTestCase extends TestCase
         // phpcs:enable
     }
 
-    protected function setUpEnv(): void
-    {
-        require ROOT_PATH . 'test/bootstrap-dist.php';
-    }
-
     /**
      * Desctroys the environment built for the test.
      * Clean all variables
diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
index 58e3218458..96a60b0687 100644
--- a/test/classes/CharsetsTest.php
+++ b/test/classes/CharsetsTest.php
@@ -17,7 +17,6 @@ class CharsetsTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $GLOBALS['cfg']['DBG']['sql'] = false;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
     }
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index 4518598003..ec172223dd 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -30,6 +30,8 @@ class CoreTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setTheme();
+        parent::setLanguage();
         parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
@@ -598,7 +600,6 @@ class CoreTest extends PmaTestCase
     public function testSendHeaderLocationWithoutSidWithIis()
     {
         $GLOBALS['server'] = 0;
-        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
 
@@ -607,8 +608,6 @@ class CoreTest extends PmaTestCase
         $this->mockResponse('Location: ' . $testUri);
         Core::sendHeaderLocation($testUri); // sets $GLOBALS['header']
 
-        $this->tearDown();
-
         $this->mockResponse('Refresh: 0; ' . $testUri);
         Core::sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
     }
diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php
index 7177afe7c3..5bf4a3265f 100644
--- a/test/classes/CreateAddFieldTest.php
+++ b/test/classes/CreateAddFieldTest.php
@@ -23,7 +23,6 @@ class CreateAddFieldTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $this->createAddField = new CreateAddField($GLOBALS['dbi']);
     }
 
diff --git a/test/classes/Database/EventsTest.php b/test/classes/Database/EventsTest.php
index e738c18c25..effe48f945 100644
--- a/test/classes/Database/EventsTest.php
+++ b/test/classes/Database/EventsTest.php
@@ -10,6 +10,7 @@ use PhpMyAdmin\Database\Events;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
+use ReflectionProperty;
 
 class EventsTest extends AbstractTestCase
 {
@@ -22,16 +23,19 @@ class EventsTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['text_dir'] = 'ltr';
         parent::setGlobalConfig();
+        parent::setLanguage();
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['tear_down']['server'] = true;
-
+        $response = new ReflectionProperty(Response::class, '_instance');
+        $response->setAccessible(true);
+        $response->setValue(null);
+        $response->setAccessible(false);
         $this->events = new Events(
             $GLOBALS['dbi'],
             new Template(),
@@ -39,18 +43,6 @@ class EventsTest extends AbstractTestCase
         );
     }
 
-    /**
-     * Tear down
-     */
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        if ($GLOBALS['tear_down']['server']) {
-            unset($GLOBALS['cfg']['ServerDefault']);
-        }
-        unset($GLOBALS['tear_down']);
-    }
-
     /**
      * Test for getDataFromRequest
      *
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index 38f8cb2e5c..cd7ed9bb3a 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -30,7 +30,6 @@ class QbeTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'pma_test';
         $this->object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');
diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php
index b2701b0e14..7ae6752881 100644
--- a/test/classes/Database/RoutinesTest.php
+++ b/test/classes/Database/RoutinesTest.php
@@ -23,8 +23,8 @@ class RoutinesTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         parent::setGlobalConfig();
+        parent::setLanguage();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
diff --git a/test/classes/Database/TriggersTest.php b/test/classes/Database/TriggersTest.php
index 2267f2a5dc..c39bc61992 100644
--- a/test/classes/Database/TriggersTest.php
+++ b/test/classes/Database/TriggersTest.php
@@ -21,8 +21,8 @@ class TriggersTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         parent::setGlobalConfig();
+        parent::setLanguage();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['db'] = 'pma_test';
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 26152db62e..0cc9bc8517 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -26,7 +26,6 @@ class InnodbTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $GLOBALS['server'] = 0;
         $this->object = new Innodb('innodb');
     }
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 9e07de5ffc..fdd08f8160 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -38,6 +38,8 @@ class InsertEditTest extends AbstractTestCase
     {
         parent::setUp();
         parent::setLanguage();
+        parent::setGlobalConfig();
+        parent::loadDefaultConfig();
         $GLOBALS['server'] = 1;
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $GLOBALS['cfg']['ServerDefault'] = 1;
@@ -65,11 +67,21 @@ class InsertEditTest extends AbstractTestCase
         $GLOBALS['cfg']['Confirm'] = true;
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
         $GLOBALS['cfg']['enable_drag_drop_import'] = true;
-        parent::setGlobalConfig();
-
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
     }
 
+    /**
+     * Teardown all objects
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $response = new ReflectionProperty(Response::class, '_instance');
+        $response->setAccessible(true);
+        $response->setValue(null);
+        $response->setAccessible(false);
+    }
+
     /**
      * Call protected functions by setting visibility to public.
      *
diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php
index 31daf01520..84313a3b56 100644
--- a/test/classes/RelationCleanupTest.php
+++ b/test/classes/RelationCleanupTest.php
@@ -31,7 +31,6 @@ class RelationCleanupTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $GLOBALS['server'] = 1;
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = [
diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php
index 82f8cf4c75..ae7f9d5e29 100644
--- a/test/classes/ReplicationGuiTest.php
+++ b/test/classes/ReplicationGuiTest.php
@@ -33,7 +33,6 @@ class ReplicationGuiTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         //$_POST
         $_POST['mr_adduser'] = 'mr_adduser';
 
diff --git a/test/classes/Server/PluginsTest.php b/test/classes/Server/PluginsTest.php
index d12d993ac2..6f9173286f 100644
--- a/test/classes/Server/PluginsTest.php
+++ b/test/classes/Server/PluginsTest.php
@@ -14,7 +14,6 @@ class PluginsTest extends AbstractTestCase
 
     public function testGetAll(): void
     {
-        parent::setUpEnv();
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['server'] = 0;
diff --git a/test/classes/Table/SearchTest.php b/test/classes/Table/SearchTest.php
index 9f0a706085..28409e4d9f 100644
--- a/test/classes/Table/SearchTest.php
+++ b/test/classes/Table/SearchTest.php
@@ -14,7 +14,6 @@ class SearchTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         global $dbi;
 
         $this->search = new Search($dbi);
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index 1b2de06047..6b0f24af43 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -23,7 +23,6 @@ class TypesTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setUpEnv();
         $this->object = new Types($GLOBALS['dbi']);
     }