diff --git a/src/Providers/JWTAuthServiceProvider.php b/src/Providers/JWTAuthServiceProvider.php
index 59a8ac492..7ba7c5f18 100644
--- a/src/Providers/JWTAuthServiceProvider.php
+++ b/src/Providers/JWTAuthServiceProvider.php
@@ -14,8 +14,8 @@
 use Tymon\JWTAuth\JWTAuth;
 use Tymon\JWTAuth\Blacklist;
 use Tymon\JWTAuth\JWTManager;
-use Tymon\JWTAuth\PayloadFactory;
 use Tymon\JWTAuth\Claims\Factory;
+use Tymon\JWTAuth\PayloadFactory;
 use Illuminate\Support\ServiceProvider;
 use Tymon\JWTAuth\Commands\JWTGenerateCommand;
 use Tymon\JWTAuth\Validators\PayloadValidator;
diff --git a/tests/BlacklistTest.php b/tests/BlacklistTest.php
index 28d4768b3..0f00881ad 100644
--- a/tests/BlacklistTest.php
+++ b/tests/BlacklistTest.php
@@ -11,16 +11,16 @@
 
 namespace Tymon\JWTAuth\Test\Providers\JWT;
 
-use Carbon\Carbon;
 use Mockery;
-use Tymon\JWTAuth\Blacklist;
+use Carbon\Carbon;
 use Tymon\JWTAuth\Payload;
+use Tymon\JWTAuth\Blacklist;
+use Tymon\JWTAuth\Claims\JwtId;
 use Tymon\JWTAuth\Claims\Issuer;
+use Tymon\JWTAuth\Claims\Subject;
 use Tymon\JWTAuth\Claims\IssuedAt;
-use Tymon\JWTAuth\Claims\Expiration;
 use Tymon\JWTAuth\Claims\NotBefore;
-use Tymon\JWTAuth\Claims\Subject;
-use Tymon\JWTAuth\Claims\JwtId;
+use Tymon\JWTAuth\Claims\Expiration;
 
 class BlacklistTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Commands/JWTGenerateCommandTest.php b/tests/Commands/JWTGenerateCommandTest.php
index a9e790e96..a4a11ac56 100644
--- a/tests/Commands/JWTGenerateCommandTest.php
+++ b/tests/Commands/JWTGenerateCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace Tymon\JWTAuth\Test;
 
-use Symfony\Component\Console\Tester\CommandTester;
-use Tymon\JWTAuth\Commands\JWTGenerateCommand;
 use Illuminate\Foundation\Application;
-use Symfony\Component\Console\Output\NullOutput;
+use Tymon\JWTAuth\Commands\JWTGenerateCommand;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class JWTGenerateCommandTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/JWTAuthTest.php b/tests/JWTAuthTest.php
index c5e78078e..3f910d4b9 100644
--- a/tests/JWTAuthTest.php
+++ b/tests/JWTAuthTest.php
@@ -12,9 +12,9 @@
 namespace Tymon\JWTAuth\Test;
 
 use Mockery;
+use Tymon\JWTAuth\Token;
 use Tymon\JWTAuth\JWTAuth;
 use Illuminate\Http\Request;
-use Tymon\JWTAuth\Token;
 
 class JWTAuthTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/JWTManagerTest.php b/tests/JWTManagerTest.php
index 6bb95f425..e3ad97d6b 100644
--- a/tests/JWTManagerTest.php
+++ b/tests/JWTManagerTest.php
@@ -12,15 +12,15 @@
 namespace Tymon\JWTAuth\Test\Providers\JWT;
 
 use Mockery;
-use Tymon\JWTAuth\JWTManager;
-use Tymon\JWTAuth\Payload;
 use Tymon\JWTAuth\Token;
+use Tymon\JWTAuth\Payload;
+use Tymon\JWTAuth\JWTManager;
+use Tymon\JWTAuth\Claims\JwtId;
 use Tymon\JWTAuth\Claims\Issuer;
+use Tymon\JWTAuth\Claims\Subject;
 use Tymon\JWTAuth\Claims\IssuedAt;
-use Tymon\JWTAuth\Claims\Expiration;
 use Tymon\JWTAuth\Claims\NotBefore;
-use Tymon\JWTAuth\Claims\Subject;
-use Tymon\JWTAuth\Claims\JwtId;
+use Tymon\JWTAuth\Claims\Expiration;
 
 class JWTManagerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PayloadFactoryTest.php b/tests/PayloadFactoryTest.php
index 00a676353..f25d6cc75 100644
--- a/tests/PayloadFactoryTest.php
+++ b/tests/PayloadFactoryTest.php
@@ -11,17 +11,17 @@
 
 namespace Tymon\JWTAuth\Test\Providers\JWT;
 
-use Carbon\Carbon;
 use Mockery;
-use Tymon\JWTAuth\PayloadFactory;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Tymon\JWTAuth\Claims\JwtId;
+use Tymon\JWTAuth\Claims\Custom;
 use Tymon\JWTAuth\Claims\Issuer;
+use Tymon\JWTAuth\Claims\Subject;
+use Tymon\JWTAuth\PayloadFactory;
 use Tymon\JWTAuth\Claims\IssuedAt;
-use Tymon\JWTAuth\Claims\Expiration;
 use Tymon\JWTAuth\Claims\NotBefore;
-use Tymon\JWTAuth\Claims\Subject;
-use Tymon\JWTAuth\Claims\JwtId;
-use Tymon\JWTAuth\Claims\Custom;
+use Tymon\JWTAuth\Claims\Expiration;
 
 class PayloadFactoryTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PayloadTest.php b/tests/PayloadTest.php
index 88ac3807c..42ae69be2 100644
--- a/tests/PayloadTest.php
+++ b/tests/PayloadTest.php
@@ -11,16 +11,16 @@
 
 namespace Tymon\JWTAuth\Test\Providers\JWT;
 
+use Mockery;
 use Carbon\Carbon;
 use Tymon\JWTAuth\Payload;
-use Mockery;
+use Tymon\JWTAuth\Claims\JwtId;
 use Tymon\JWTAuth\Claims\Issuer;
+use Tymon\JWTAuth\Claims\Subject;
+use Tymon\JWTAuth\Claims\Audience;
 use Tymon\JWTAuth\Claims\IssuedAt;
-use Tymon\JWTAuth\Claims\Expiration;
 use Tymon\JWTAuth\Claims\NotBefore;
-use Tymon\JWTAuth\Claims\Audience;
-use Tymon\JWTAuth\Claims\Subject;
-use Tymon\JWTAuth\Claims\JwtId;
+use Tymon\JWTAuth\Claims\Expiration;
 
 class PayloadTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Providers/JWT/NamshiAdapterTest.php b/tests/Providers/JWT/NamshiAdapterTest.php
index 518cd2303..2f4be914b 100644
--- a/tests/Providers/JWT/NamshiAdapterTest.php
+++ b/tests/Providers/JWT/NamshiAdapterTest.php
@@ -11,8 +11,8 @@
 
 namespace Tymon\JWTAuth\Test\Providers\JWT;
 
-use Carbon\Carbon;
 use Mockery;
+use Carbon\Carbon;
 use Tymon\JWTAuth\Providers\JWT\NamshiAdapter;
 
 class NamshiAdapterTest extends \PHPUnit_Framework_TestCase