diff --git a/tests/nestedset/fixtures/phpbb_forums.xml b/tests/tree/fixtures/phpbb_forums.xml
similarity index 100%
rename from tests/nestedset/fixtures/phpbb_forums.xml
rename to tests/tree/fixtures/phpbb_forums.xml
diff --git a/tests/nestedset/set_forum_add_remove_test.php b/tests/tree/nestedset_forum_add_remove_test.php
similarity index 98%
rename from tests/nestedset/set_forum_add_remove_test.php
rename to tests/tree/nestedset_forum_add_remove_test.php
index 97b6348d67..623cb2bbf3 100644
--- a/tests/nestedset/set_forum_add_remove_test.php
+++ b/tests/tree/nestedset_forum_add_remove_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/set_forum_base.php';
 
-class phpbb_tests_nestedset_set_forum_add_remove_test extends phpbb_tests_nestedset_set_forum_base
+class phpbb_tests_tree_nestedset_forum_add_remove_test extends phpbb_tests_tree_nestedset_forum_base
 {
 	public function remove_add_data()
 	{
diff --git a/tests/nestedset/set_forum_base.php b/tests/tree/nestedset_forum_base.php
similarity index 96%
rename from tests/nestedset/set_forum_base.php
rename to tests/tree/nestedset_forum_base.php
index 0d1cb1f881..1e79df2c0d 100644
--- a/tests/nestedset/set_forum_base.php
+++ b/tests/tree/nestedset_forum_base.php
@@ -1,13 +1,13 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-class phpbb_tests_nestedset_set_forum_base extends phpbb_database_test_case
+class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case
 {
 	public function getDataSet()
 	{
diff --git a/tests/nestedset/set_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php
similarity index 96%
rename from tests/nestedset/set_forum_get_data_test.php
rename to tests/tree/nestedset_forum_get_data_test.php
index a0e255b9b8..4ce679f05d 100644
--- a/tests/nestedset/set_forum_get_data_test.php
+++ b/tests/tree/nestedset_forum_get_data_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/set_forum_base.php';
 
-class phpbb_tests_nestedset_set_forum_get_data_test extends phpbb_tests_nestedset_set_forum_base
+class phpbb_tests_tree_nestedset_forum_get_data_test extends phpbb_tests_tree_nestedset_forum_base
 {
 	public function get_full_branch_data_data()
 	{
diff --git a/tests/nestedset/set_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php
similarity index 99%
rename from tests/nestedset/set_forum_move_test.php
rename to tests/tree/nestedset_forum_move_test.php
index 90fc1c5468..29af693374 100644
--- a/tests/nestedset/set_forum_move_test.php
+++ b/tests/tree/nestedset_forum_move_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/set_forum_base.php';
 
-class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_set_forum_base
+class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nestedset_forum_base
 {
 	public function move_data()
 	{
diff --git a/tests/nestedset/set_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php
similarity index 95%
rename from tests/nestedset/set_forum_regenerate_test.php
rename to tests/tree/nestedset_forum_regenerate_test.php
index 0e3a2123a0..3bd272370a 100644
--- a/tests/nestedset/set_forum_regenerate_test.php
+++ b/tests/tree/nestedset_forum_regenerate_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/set_forum_base.php';
 
-class phpbb_tests_nestedset_set_forum_regenerate_test extends phpbb_tests_nestedset_set_forum_base
+class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_nestedset_forum_base
 {
 	protected $fixed_set = array(
 		array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => ''),
diff --git a/tests/nestedset/set_forum_test.php b/tests/tree/nestedset_forum_test.php
similarity index 97%
rename from tests/nestedset/set_forum_test.php
rename to tests/tree/nestedset_forum_test.php
index ab4da1ff1e..ac02886e95 100644
--- a/tests/nestedset/set_forum_test.php
+++ b/tests/tree/nestedset_forum_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/set_forum_base.php';
 
-class phpbb_tests_nestedset_set_forum_test extends phpbb_tests_nestedset_set_forum_base
+class pphpbb_tests_tree_nestedset_forum_test extends phpbb_tests_tree_nestedset_forum_base
 {
 	public function forum_constructor_data()
 	{