diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index <HASH>..<HASH> 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -176,8 +176,13 @@ class Fixture extends \PHPUnit_Framework_Assert
 
     public function performSetUp($setupEnvironmentOnly = false)
     {
+        // TODO: don't use static var, use test env var for this
         TestingEnvironmentManipulator::$extraPluginsToLoad = $this->extraPluginsToLoad;
 
+        $this->getTestEnvironment()->testCaseClass = $this->testCaseClass;
+        $this->getTestEnvironment()->fixtureClass = get_class($this);
+        $this->getTestEnvironment()->save();
+
         $this->createEnvironmentInstance();
 
         try {
@@ -269,10 +274,6 @@ class Fixture extends \PHPUnit_Framework_Assert
             return;
         }
 
-        $this->getTestEnvironment()->testCaseClass = $this->testCaseClass;
-        $this->getTestEnvironment()->fixtureClass = get_class($this);
-        $this->getTestEnvironment()->save();
-
         PiwikCache::getTransientCache()->flushAll();
 
         if ($this->overwriteExisting
Setup test environment before anything else in Fixture setup so test case class and fixture class show up properly.