diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
index 0c36e3ba82fbdbf8da3d73d25bc2f73b78a9c5ef..372e9815c5a508cb6574f026c89513f1a17e15a5 100644
--- a/core/Container/ContainerFactory.php
+++ b/core/Container/ContainerFactory.php
@@ -13,7 +13,6 @@ use DI\ContainerBuilder;
 use Doctrine\Common\Cache\ArrayCache;
 use Piwik\Application\Kernel\GlobalSettingsProvider;
 use Piwik\Application\Kernel\PluginList;
-use Piwik\Development;
 use Piwik\Plugin\Manager;
 
 /**
@@ -89,7 +88,12 @@ class ContainerFactory
         }
 
         // Environment config
-        $this->addEnvironmentConfig($builder);
+        $this->addEnvironmentConfig($builder, $this->environment);
+
+        // Test config
+        if (defined('PIWIK_TEST_MODE')) {
+            $this->addEnvironmentConfig($builder, 'test');
+        }
 
         if (!empty($this->definitions)) {
             $builder->addDefinitions($this->definitions);
@@ -102,13 +106,13 @@ class ContainerFactory
         return $container;
     }
 
-    private function addEnvironmentConfig(ContainerBuilder $builder)
+    private function addEnvironmentConfig(ContainerBuilder $builder, $environment)
     {
-        if (!$this->environment) {
+        if (!$environment) {
             return;
         }
 
-        $file = sprintf('%s/config/environment/%s.php', PIWIK_USER_PATH, $this->environment);
+        $file = sprintf('%s/config/environment/%s.php', PIWIK_USER_PATH, $environment);
 
         if (file_exists($file)) {
             $builder->addDefinitions($file);
diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php
index 644dc3a72bf0dc7583073ce209a8a38eaa87ddec..5664b892944f19e1067ac0fc4435440d173c5070 100644
--- a/misc/cron/updatetoken.php
+++ b/misc/cron/updatetoken.php
@@ -33,6 +33,8 @@ if (!Common::isPhpCliMode()) {
 
 $testmode = in_array('--testmode', $_SERVER['argv']);
 if ($testmode) {
+    define('PIWIK_TEST_MODE', true);
+
     Tests\Framework\TestingEnvironment::addHooks();
 }
 
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index baeb4b89d363a6c07ef315086e2a37a58889dbca..94d88c1bf829f35f7a1dcd402c8b94f37771c367 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -88,6 +88,10 @@ class TestsSetupFixture extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!defined('PIWIK_TEST_MODE')) {
+            define('PIWIK_TEST_MODE', true);
+        }
+
         $serverGlobal = $input->getOption('server-global');
         if ($serverGlobal) {
             $_SERVER = json_decode($serverGlobal, true);
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 930d5b222d83147206f00dcec2f6eacb45840533..3136c141980ab6103b46bef7b1728744e4b432a0 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -913,7 +913,7 @@ class Fixture extends \PHPUnit_Framework_Assert
 
     public function createEnvironmentInstance()
     {
-        $this->piwikEnvironment = new Environment('test', array_merge($this->provideContainerConfig(), $this->extraDefinitions));
+        $this->piwikEnvironment = new Environment($environment = null, array_merge($this->provideContainerConfig(), $this->extraDefinitions));
         $this->piwikEnvironment->init();
     }
 }
diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
index f1044a447f5697a83c147c065d7b78043d6787af..70c054faea82a59f46759eed809a3e36cdbb7de0 100755
--- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
@@ -39,7 +39,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
 
         // make sure the global container exists for the next test case that is executed (since logging can be done
         // before a test sets up an environment)
-        $nextTestEnviornment = new Environment('test', array(), $postBootstrappedEvent = false);
+        $nextTestEnviornment = new Environment($environment = null, array(), $postBootstrappedEvent = false);
         $nextTestEnviornment->init();
 
         parent::tearDown();
@@ -57,7 +57,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
 
     protected function initEnvironment()
     {
-        $this->environment = new Environment('test', $this->provideContainerConfig(), $postBootstrappedEvent = false);
+        $this->environment = new Environment($environment = null, $this->provideContainerConfig(), $postBootstrappedEvent = false);
         $this->environment->init();
     }
 }
diff --git a/tests/PHPUnit/Framework/TestingEnvironment.php b/tests/PHPUnit/Framework/TestingEnvironment.php
index 94b85e012c8759d34398c1e1f30d3a5685fa79a7..dec7d75299b8e759f92740c0c62fb8e35952e62c 100644
--- a/tests/PHPUnit/Framework/TestingEnvironment.php
+++ b/tests/PHPUnit/Framework/TestingEnvironment.php
@@ -18,10 +18,6 @@ use Piwik\DbHelper;
 use Piwik\Piwik;
 use Piwik\Application\Environment;
 
-if (!defined('PIWIK_TEST_MODE')) {
-    define('PIWIK_TEST_MODE', true);
-}
-
 class Piwik_MockAccess
 {
     private $access;
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index a6045ad4075693e9ef4a0d254a8a903621b56e17..01dda0ec0d3c0104dbef323843dcecdec03a5070 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -43,7 +43,7 @@ if (getenv('PIWIK_USE_XHPROF') == 1) {
 
 // setup container for tests
 function setupRootContainer() {
-    $rootTestEnvironment = new \Piwik\Application\Environment('test');
+    $rootTestEnvironment = new \Piwik\Application\Environment(null);
     $rootTestEnvironment->init();
 }
 
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php
index 69af8b7804bdc5c5a625dccaca0bfda1df1270c7..2b3407f5d5438a90cccc00d84c57f95f59678dfc 100644
--- a/tests/PHPUnit/proxy/includes.php
+++ b/tests/PHPUnit/proxy/includes.php
@@ -6,6 +6,9 @@ if (!defined('PIWIK_INCLUDE_PATH')) {
 if (!defined('PIWIK_USER_PATH')) {
     define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 }
+if (!defined('PIWIK_TEST_MODE')) {
+    define('PIWIK_TEST_MODE', true);
+}
 
 require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';