diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 51fa08ee8a2182fa7feb632b3760b45f9b5fd953..f61beffbb1f5446777119826b159cc0f96442c37 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -18,6 +18,7 @@ use Piwik\DbHelper;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugin;
 use Piwik\Plugins\LanguagesManager\API as APILanguageManager;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
@@ -40,6 +41,7 @@ use Piwik_LocalTracker;
 use Piwik\Updater;
 use Piwik\Plugins\CoreUpdater\CoreUpdater;
 use Exception;
+use ReflectionClass;
 
 /**
  * Base type for all system test fixtures. System test fixtures
@@ -119,7 +121,9 @@ class Fixture extends \PHPUnit_Framework_Assert
         }
 
         if ($this->persistFixtureData) {
-            return str_replace("\\", "_", get_class($this));
+            $klass = new ReflectionClass($this);
+            $id = Plugin::getPluginNameFromNamespace($klass->getNamespaceName()) . "_" . $klass->getShortName();
+            return $id;
         }
 
         return Config::getInstance()->database_tests['dbname'];