diff --git a/test/Tmdb/Tests/ApiTokenTest.php b/test/Tmdb/Tests/ApiTokenTest.php
index f1fc46d6..5949e173 100644
--- a/test/Tmdb/Tests/ApiTokenTest.php
+++ b/test/Tmdb/Tests/ApiTokenTest.php
@@ -10,6 +10,8 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
+namespace Tmdb\Tests;
+
 class ApiTokenTest extends \PHPUnit_Framework_TestCase
 {
     const API_TOKEN = 'abcdefg';
diff --git a/test/Tmdb/Tests/ClientTest.php b/test/Tmdb/Tests/ClientTest.php
index c81c7a45..e9b877d3 100644
--- a/test/Tmdb/Tests/ClientTest.php
+++ b/test/Tmdb/Tests/ClientTest.php
@@ -10,6 +10,8 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
+namespace Tmdb\Tests;
+
 class ClientTest extends \Tmdb\Tests\TestCase
 {
     const API_TOKEN = 'abcdef';
diff --git a/test/Tmdb/Tests/Helper/ImageHelperTest.php b/test/Tmdb/Tests/Helper/ImageHelperTest.php
index 69a29b3c..ae3864b8 100644
--- a/test/Tmdb/Tests/Helper/ImageHelperTest.php
+++ b/test/Tmdb/Tests/Helper/ImageHelperTest.php
@@ -10,6 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
+namespace Tmdb\Tests\Helper;
 
 use Tmdb\Tests\TestCase as Base;
 
diff --git a/test/Tmdb/Tests/Model/Collection/KeywordsTest.php b/test/Tmdb/Tests/Model/Collection/KeywordsTest.php
index c7ddef32..a7a23524 100644
--- a/test/Tmdb/Tests/Model/Collection/KeywordsTest.php
+++ b/test/Tmdb/Tests/Model/Collection/KeywordsTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-namespace Tmdb\Tests\Model\Common;
+namespace Tmdb\Tests\Model\Collection;
 
 use Tmdb\Model\Collection\Keywords;
 use Tmdb\Model\Keyword;
diff --git a/test/Tmdb/Tests/Model/Collection/PeopleTest.php b/test/Tmdb/Tests/Model/Collection/PeopleTest.php
index e0637429..2c11166c 100644
--- a/test/Tmdb/Tests/Model/Collection/PeopleTest.php
+++ b/test/Tmdb/Tests/Model/Collection/PeopleTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-namespace Tmdb\Tests\Model\Common;
+namespace Tmdb\Tests\Model\Collection;
 
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Person;
diff --git a/test/Tmdb/Tests/Model/Query/Discover/DiscoverMoviesQueryTest.php b/test/Tmdb/Tests/Model/Query/Discover/DiscoverMoviesQueryTest.php
index 41446cae..937b008c 100644
--- a/test/Tmdb/Tests/Model/Query/Discover/DiscoverMoviesQueryTest.php
+++ b/test/Tmdb/Tests/Model/Query/Discover/DiscoverMoviesQueryTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-namespace Tmdb\Tests\Model\Query;
+namespace Tmdb\Tests\Model\Query\Discover;
 
 use Tmdb\Model\Query\Discover\DiscoverMoviesQuery;
 use Tmdb\Tests\TestCase;
diff --git a/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php b/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
index 297e1d42..e17d1443 100644
--- a/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
+++ b/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-namespace Tmdb\Tests\Model\Query;
+namespace Tmdb\Tests\Model\Query\Discover;
 
 use Tmdb\Model\Query\Discover\DiscoverTvQuery;
 use Tmdb\Tests\TestCase;
diff --git a/test/Tmdb/Tests/RequestTokenTest.php b/test/Tmdb/Tests/RequestTokenTest.php
index 90608004..d5df52bf 100644
--- a/test/Tmdb/Tests/RequestTokenTest.php
+++ b/test/Tmdb/Tests/RequestTokenTest.php
@@ -10,6 +10,8 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
+namespace Tmdb\Tests;
+
 class RequestTokenTest extends \PHPUnit_Framework_TestCase
 {
     const REQUEST_TOKEN = '641bf16c663db167c6cffcdff41126039d4445bf';
diff --git a/test/Tmdb/Tests/SessionTokenTest.php b/test/Tmdb/Tests/SessionTokenTest.php
index 2a9d0836..e13164bf 100644
--- a/test/Tmdb/Tests/SessionTokenTest.php
+++ b/test/Tmdb/Tests/SessionTokenTest.php
@@ -10,6 +10,8 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
+namespace Tmdb\Tests;
+
 class SessionTokenTest extends \PHPUnit_Framework_TestCase
 {
     const SESSION_TOKEN = '80b2bf99520cd795ff54e31af97917bc9e3a7c8c';