diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 48dc197..3587a90 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
          bootstrap="./test/bootstrap.php">
     <testsuites>
         <testsuite name="PHPParser Test Suite">
-            <directory>./test/Unit/</directory>
+            <directory>./test/</directory>
         </testsuite>
     </testsuites>
 
diff --git a/test/Unit/LexerTest.php b/test/PHPParser/Tests/LexerTest.php
similarity index 97%
rename from test/Unit/LexerTest.php
rename to test/PHPParser/Tests/LexerTest.php
index bb47204..881de37 100644
--- a/test/Unit/LexerTest.php
+++ b/test/PHPParser/Tests/LexerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Unit_LexerTest extends PHPUnit_Framework_TestCase
+class PHPParser_Tests_LexerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider provideTestError
diff --git a/test/Unit/NodeDumperTest.php b/test/PHPParser/Tests/NodeDumperTest.php
similarity index 93%
rename from test/Unit/NodeDumperTest.php
rename to test/PHPParser/Tests/NodeDumperTest.php
index 116f7aa..4a4353c 100644
--- a/test/Unit/NodeDumperTest.php
+++ b/test/PHPParser/Tests/NodeDumperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Unit_NodeDumperTest extends PHPUnit_Framework_TestCase
+class PHPParser_Tests_NodeDumperTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider provideTestDump
diff --git a/test/Unit/NodeTraverserTest.php b/test/PHPParser/Tests/NodeTraverserTest.php
similarity index 90%
rename from test/Unit/NodeTraverserTest.php
rename to test/PHPParser/Tests/NodeTraverserTest.php
index 68565a6..cb5ef32 100644
--- a/test/Unit/NodeTraverserTest.php
+++ b/test/PHPParser/Tests/NodeTraverserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Unit_NodeTraverserTest extends PHPUnit_Framework_TestCase
+class PHPParser_Tests_NodeTraverserTest extends PHPUnit_Framework_TestCase
 {
     function getTestNode() {
         return array(
@@ -23,7 +23,7 @@ class Unit_NodeTraverserTest extends PHPUnit_Framework_TestCase
     function testTraverse() {
         $node = $this->getTestNode();
 
-        $visitor   = new Unit_NodeVisitor;
+        $visitor   = new PHPParser_Tests_NodeVisitor;
         $traverser = new PHPParser_NodeTraverser;
 
         $traverser->addVisitor($visitor);
@@ -61,7 +61,7 @@ class Unit_NodeTraverserTest extends PHPUnit_Framework_TestCase
     function testModifyingTraverse() {
         $node = $this->getTestNode();
 
-        $visitor   = new Unit_ModifyingNodeVisitor;
+        $visitor   = new PHPParser_Tests_ModifyingNodeVisitor;
         $traverser = new PHPParser_NodeTraverser;
 
         $traverser->addVisitor($visitor);
@@ -80,7 +80,7 @@ class Unit_NodeTraverserTest extends PHPUnit_Framework_TestCase
     }
 }
 
-class Unit_NodeVisitor extends PHPParser_NodeVisitorAbstract
+class PHPParser_Tests_NodeVisitor extends PHPParser_NodeVisitorAbstract
 {
     public $beforeTraverseNode;
     public $enteredNodes;
@@ -108,7 +108,7 @@ class Unit_NodeVisitor extends PHPParser_NodeVisitorAbstract
     }
 }
 
-class Unit_ModifyingNodeVisitor extends PHPParser_NodeVisitorAbstract
+class PHPParser_Tests_ModifyingNodeVisitor extends PHPParser_NodeVisitorAbstract
 {
     public function leaveNode(PHPParser_NodeAbstract &$node) {
         // delete namespace nodes by merging them