diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/PMA_Node_Function_Container_test.php
new file mode 100644
index 0000000000..2622f346bc
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Function_Container_test.php
@@ -0,0 +1,37 @@
+<?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_Function_Container_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_Function_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'db_routines.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('functions', $parent->real_name);
+    }
+}
+?>
diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/PMA_Node_Index_Container_test.php
new file mode 100644
index 0000000000..144c096ba1
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Index_Container_test.php
@@ -0,0 +1,37 @@
+<?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_Index_Container_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_Index_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'tbl_indexes.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('indexes', $parent->real_name);
+    }
+}
+?>
diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
new file mode 100644
index 0000000000..4910739031
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
@@ -0,0 +1,37 @@
+<?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_Procedure_Container_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_Procedure_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'db_routines.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('procedures', $parent->real_name);
+    }
+}
+?>