diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 16006a3e298..80a7d0d543f 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -178,19 +178,8 @@ public static function addHooks($globalObservers = array())
             }
         }
 
-        if (!empty($diConfig)) {
-            StaticContainer::addDefinitions($diConfig);
-        }
-
         \Piwik\Cache\Backend\File::$invalidateOpCacheBeforeRead = true;
 
-        Piwik::addAction('Access.createAccessSingleton', function($access) use ($testingEnvironment) {
-            if (!$testingEnvironment->testUseRegularAuth) {
-                $access = new Piwik_MockAccess($access);
-                \Piwik\Access::setSingletonInstance($access);
-            }
-        });
-
         $pluginsToLoad = $testingEnvironment->getCoreAndSupportedPlugins();
         if (!empty($testingEnvironment->pluginsToLoad)) {
             $pluginsToLoad = array_unique(array_merge($pluginsToLoad, $testingEnvironment->pluginsToLoad));
@@ -198,6 +187,13 @@ public static function addHooks($globalObservers = array())
 
         sort($pluginsToLoad);
 
+        $globalObservers[] = array('Access.createAccessSingleton', function($access) use ($testingEnvironment) {
+            if (!$testingEnvironment->testUseRegularAuth) {
+                $access = new Piwik_MockAccess($access);
+                \Piwik\Access::setSingletonInstance($access);
+            }
+        });
+
         if (!$testingEnvironment->dontUseTestConfig) {
             $globalObservers[] = array('Config.createConfigSingleton', function(IniFileChain $chain) use ($testingEnvironment, $pluginsToLoad) {
                 $general =& $chain->get('General');
@@ -307,6 +303,8 @@ public static function addHooks($globalObservers = array())
         });
 
         $diConfig['observers.global'] = \DI\add($globalObservers);
+
+        StaticContainer::addDefinitions($diConfig);
     }
 
     public function arrayMergeRecursiveDistinct(array $array1, array $array2)
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index b5a984cd00e..078069b30fe 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -20,16 +20,18 @@
 ob_start();
 
 try {
-    Piwik_TestingEnvironment::addHooks();
+    $globalObservers = array(
+        array('Environment.bootstrapped', function () {
+            Tracker::setTestEnvironment();
+            Manager::getInstance()->deleteAll();
+            Option::clearCache();
+            Site::clearCache();
+        })
+    );
 
-    GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
+    Piwik_TestingEnvironment::addHooks($globalObservers);
 
-    \Piwik\Piwik::addAction('Environment.bootstrapped', function () {
-        Tracker::setTestEnvironment();
-        Manager::getInstance()->deleteAll();
-        Option::clearCache();
-        Site::clearCache();
-    });
+    GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
 
     include PIWIK_INCLUDE_PATH . '/piwik.php';
 } catch (Exception $ex) {