diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/PMA_Node_Column_test.php
index 5d9ffaecd0..141ddde59f 100644
--- a/test/classes/navigation/PMA_Node_Column_test.php
+++ b/test/classes/navigation/PMA_Node_Column_test.php
@@ -27,6 +27,10 @@ class Node_Column_Test extends PHPUnit_Framework_TestCase
             'text',
             $parent->links
         );
+        $this->assertContains(
+            'tbl_structure.php',
+            $parent->links['text']
+        );
     }
 
     public function testAddNode()
diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php
new file mode 100644
index 0000000000..093686f13f
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Database_test.php
@@ -0,0 +1,51 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for NodeFactory class and Node_Column class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/navigation/NodeFactory.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+
+
+class Node_Database_Test extends PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $GLOBALS['server'] = 0;
+        $GLOBALS['token'] = 'token';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    public function testConstructor()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Database');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'db_structure.php',
+            $parent->links['text']
+        );
+    }
+
+    public function testAddNode()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Database', 'parent');
+        $child = PMA_NodeFactory::getInstance('Node_Database', 'child');
+        $parent->addChild($child);
+        $this->assertEquals(
+            $parent->getChild($child->name),
+            $child
+        );
+        $this->assertEquals(
+            $parent->getChild($child->real_name, true),
+            $child
+        );
+    }
+}
+?>
diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/PMA_Node_Event_test.php
new file mode 100644
index 0000000000..5187f244a8
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Event_test.php
@@ -0,0 +1,51 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for NodeFactory class and Node_Column class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/navigation/NodeFactory.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+
+
+class Node_Event_Test extends PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $GLOBALS['server'] = 0;
+        $GLOBALS['token'] = 'token';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    public function testConstructor()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Event');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'db_events.php',
+            $parent->links['text']
+        );
+    }
+
+    public function testAddNode()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Event', 'parent');
+        $child = PMA_NodeFactory::getInstance('Node_Event', 'child');
+        $parent->addChild($child);
+        $this->assertEquals(
+            $parent->getChild($child->name),
+            $child
+        );
+        $this->assertEquals(
+            $parent->getChild($child->real_name, true),
+            $child
+        );
+    }
+}
+?>