diff --git a/typo3/sysext/core/Tests/FunctionalTestCase.php b/typo3/sysext/core/Tests/FunctionalTestCase.php
index c3c0093dff4f67931f4bd0c13595bf2a6a37ab1e..47c63b4d4290ae4283bb85a5b05cb8de8da0fb0c 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCase.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCase.php
@@ -161,11 +161,25 @@ abstract class FunctionalTestCase extends BaseTestCase
     private $bootstrapUtility = null;
 
     /**
-     * Path to TYPO3 CMS test installation for this test case
+     * Calculate a "unique" identifier for the test database and the
+     * instance patch based on the given test case class name.
      *
-     * @var string
+     * @return string
      */
-    private $instancePath;
+    protected function getInstanceIdentifier()
+    {
+        return FunctionalTestCaseBootstrapUtility::getInstanceIdentifier(get_class($this));
+    }
+
+    /**
+     * Calculates path to TYPO3 CMS test installation for this test case.
+     *
+     * @return string
+     */
+    protected function getInstancePath()
+    {
+        return FunctionalTestCaseBootstrapUtility::getInstancePath(get_class($this));
+    }
 
     /**
      * Set up creates a test instance and database.
@@ -180,7 +194,7 @@ abstract class FunctionalTestCase extends BaseTestCase
             $this->markTestSkipped('Functional tests must be called through phpunit on CLI');
         }
         $this->bootstrapUtility = new FunctionalTestCaseBootstrapUtility();
-        $this->instancePath = $this->bootstrapUtility->setUp(
+        $this->bootstrapUtility->setUp(
             get_class($this),
             $this->coreExtensionsToLoad,
             $this->testExtensionsToLoad,
@@ -356,7 +370,7 @@ abstract class FunctionalTestCase extends BaseTestCase
         }
 
         $arguments = array(
-            'documentRoot' => $this->instancePath,
+            'documentRoot' => $this->getInstancePath(),
             'requestUrl' => 'http://localhost/?id=' . $pageId . '&L=' . $languageId . $additionalParameter,
         );
 
diff --git a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
index 4bae74ccb0e82b330e6d7c346c621b970abbf391..3c2498bfce4a9505ab8eaed90f4240b6c23ab66e 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
@@ -63,6 +63,30 @@ class FunctionalTestCaseBootstrapUtility
         '/uploads'
     );
 
+    /**
+     * Calculate a "unique" identifier for the test database and the
+     * instance patch based on the given test case class name.
+     *
+     * @param string $testCaseClassName Name of test case class
+     * @return string
+     */
+    static public function getInstanceIdentifier($testCaseClassName)
+    {
+        // 7 characters of sha1 should be enough for a unique identification
+        return substr(sha1($testCaseClassName), 0, 7);
+    }
+
+    /**
+     * Calculates path to TYPO3 CMS test installation for this test case.
+     *
+     * @param string $testCaseClassName Name of test case class
+     * @return string
+     */
+    static public function getInstancePath($testCaseClassName)
+    {
+        return ORIGINAL_ROOT . 'typo3temp/functional-' . static::getInstanceIdentifier($testCaseClassName);
+    }
+
     /**
      * Set up creates a test instance and database.
      *
@@ -83,7 +107,7 @@ class FunctionalTestCaseBootstrapUtility
         array $additionalFoldersToCreate
     ) {
         $this->setUpIdentifier($testCaseClassName);
-        $this->setUpInstancePath();
+        $this->setUpInstancePath($testCaseClassName);
         if ($this->recentTestInstanceExists()) {
             $this->setUpBasicTypo3Bootstrap();
             $this->initializeTestDatabase();
@@ -127,21 +151,24 @@ class FunctionalTestCaseBootstrapUtility
      *
      * As a result, the database name will be identical between different
      * test runs, but different between each test case.
+     *
+     * @param string $testCaseClassName Name of test case class
+     * @return void
      */
     protected function setUpIdentifier($testCaseClassName)
     {
-        // 7 characters of sha1 should be enough for a unique identification
-        $this->identifier = substr(sha1($testCaseClassName), 0, 7);
+        $this->identifier = static::getInstanceIdentifier($testCaseClassName);
     }
 
     /**
      * Calculates path to TYPO3 CMS test installation for this test case.
      *
+     * @param string $testCaseClassName Name of test case class
      * @return void
      */
-    protected function setUpInstancePath()
+    protected function setUpInstancePath($testCaseClassName)
     {
-        $this->instancePath = ORIGINAL_ROOT . 'typo3temp/functional-' . $this->identifier;
+        $this->instancePath = static::getInstancePath($testCaseClassName);
     }
 
     /**