diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index 3c1651757b7802b6e0f7145ceb02960b12926695..ecaf93ec7cdffb0173aa96a02256690d4bad38b0 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -722,7 +722,7 @@ class Fixture extends PHPUnit_Framework_Assert
 
     public function dropDatabase($dbName = null)
     {
-        $dbName = $dbName ?: $this->dbName;
+        $dbName = $dbName ?: $this->dbName ?: Config::getInstance()->database_tests['dbname'];
 
         $this->log("Dropping database '$dbName'...");