diff --git a/Tests/ApiDocExtratorTest.php b/Tests/Extractor/ApiDocExtratorTest.php
similarity index 91%
rename from Tests/ApiDocExtratorTest.php
rename to Tests/Extractor/ApiDocExtratorTest.php
index 6f977f5..2d3c101 100644
--- a/Tests/ApiDocExtratorTest.php
+++ b/Tests/Extractor/ApiDocExtratorTest.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Nelmio\ApiDocBundle\Tests;
+namespace Nelmio\ApiDocBundle\Tests\Extractor;
+
+use Nelmio\ApiDocBundle\Tests\WebTestCase;
 
 class ApiDocExtractorTest extends WebTestCase
 {
diff --git a/Tests/SimpleFormatterTest.php b/Tests/Formatter/SimpleFormatterTest.php
similarity index 95%
rename from Tests/SimpleFormatterTest.php
rename to Tests/Formatter/SimpleFormatterTest.php
index 3bbfe1b..8ca8731 100644
--- a/Tests/SimpleFormatterTest.php
+++ b/Tests/Formatter/SimpleFormatterTest.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Nelmio\ApiDocBundle\Tests;
+namespace Nelmio\ApiDocBundle\Tests\Formatter;
+
+use Nelmio\ApiDocBundle\Tests\WebTestCase;
 
 class SimpleFormatterTest extends WebTestCase
 {