diff --git a/tests/ExceptionTest.php b/tests/Exception/OAuthServerExceptionTest.php
similarity index 72%
rename from tests/ExceptionTest.php
rename to tests/Exception/OAuthServerExceptionTest.php
index 2d77118e..976362e3 100644
--- a/tests/ExceptionTest.php
+++ b/tests/Exception/OAuthServerExceptionTest.php
@@ -1,17 +1,23 @@
 <?php
 
-namespace LeagueTests\Utils;
+namespace LeagueTests\Exception;
 
 use League\OAuth2\Server\Exception\OAuthServerException;
+use PHPUnit\Framework\TestCase;
 
-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class OAuthServerExceptionTest extends TestCase
 {
     public function testHasRedirect()
     {
-        $exceptionWithoutRedirect = OAuthServerException::accessDenied('Some hint');
-        $this->assertFalse($exceptionWithoutRedirect->hasRedirect());
-
         $exceptionWithRedirect = OAuthServerException::accessDenied('some hint', 'https://example.com/error');
+
         $this->assertTrue($exceptionWithRedirect->hasRedirect());
     }
-}
\ No newline at end of file
+
+    public function testDoesNotHaveRedirect()
+    {
+        $exceptionWithoutRedirect = OAuthServerException::accessDenied('Some hint');
+
+        $this->assertFalse($exceptionWithoutRedirect->hasRedirect());
+    }
+}