diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
index c9b1ae66d4..88c2fa3ece 100644
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@@ -7,8 +7,6 @@
  */
 namespace PMA\libraries;
 
-use PMA\SystemDatabase;
-
 require_once './libraries/logging.lib.php';
 require_once './libraries/util.lib.php';
 
diff --git a/libraries/SystemDatabase.php b/libraries/SystemDatabase.php
index fea7a83f97..7b91765cea 100644
--- a/libraries/SystemDatabase.php
+++ b/libraries/SystemDatabase.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\SystemDatabase class
+ * hold PMA\libraries\SystemDatabase class
  *
  * @package PMA
  */
-namespace PMA;
+namespace PMA\libraries;
 
 require_once 'libraries/database_interface.inc.php';
 
diff --git a/test/classes/PMA_SystemDatabase_test.php b/test/classes/PMA_SystemDatabase_test.php
index 0a962e9d38..ffc4611130 100644
--- a/test/classes/PMA_SystemDatabase_test.php
+++ b/test/classes/PMA_SystemDatabase_test.php
@@ -64,7 +64,7 @@ class PMA_SystemDatabaseTest extends PHPUnit_Framework_TestCase
                 )
             );
 
-        $this->sysDb = new PMA\SystemDatabase($dbi);
+        $this->sysDb = new PMA\libraries\SystemDatabase($dbi);
     }
 
     /**