Make sure to destroy the environment in integration tests.

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
index f931366ea5..ca317d6e43 100644
--- a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
@@ -76,9 +76,10 @@ abstract class IntegrationTestCase extends SystemTestCase
     {
         parent::setUp();
 
-        self::$fixture->extraDefinitions = array_merge(static::provideContainerConfigBeforeClass(), $this->provideContainerConfig());
-        self::$fixture->createEnvironmentInstance();
+        static::$fixture->extraDefinitions = array_merge(static::provideContainerConfigBeforeClass(), $this->provideContainerConfig());
+        static::$fixture->createEnvironmentInstance();
 
+        Db::createDatabaseObject();
         Fixture::loadAllPlugins(new TestingEnvironmentVariables(), get_class($this), self::$fixture->extraPluginsToLoad);
 
         Access::getInstance()->setSuperUserAccess(true);
@@ -98,6 +99,7 @@ abstract class IntegrationTestCase extends SystemTestCase
     public function tearDown()
     {
         static::$fixture->clearInMemoryCaches();
+        static::$fixture->destroyEnvironment();
 
         parent::tearDown();
     }