diff --git a/composer.json b/composer.json
index a2d4fd6..d99e6e5 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Orchestra\\Memory\\TestCase\\" : "tests/"
+            "Orchestra\\Memory\\Tests\\" : "tests/"
         }
     },
     "require": {
diff --git a/tests/Feature/Handlers/CacheTest.php b/tests/Feature/Handlers/CacheTest.php
index 26d2d21..27622f5 100644
--- a/tests/Feature/Handlers/CacheTest.php
+++ b/tests/Feature/Handlers/CacheTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature\Handlers;
+namespace Orchestra\Memory\Tests\Feature\Handlers;
 
 use Mockery as m;
 use Illuminate\Support\Facades\Cache;
 use Orchestra\Support\Facades\Memory;
-use Orchestra\Memory\TestCase\Feature\TestCase;
+use Orchestra\Memory\Tests\Feature\TestCase;
 
 class CacheTest extends TestCase
 {
diff --git a/tests/Feature/Handlers/EloquentTest.php b/tests/Feature/Handlers/EloquentTest.php
index b59d18d..becbc3c 100644
--- a/tests/Feature/Handlers/EloquentTest.php
+++ b/tests/Feature/Handlers/EloquentTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature\Handlers;
+namespace Orchestra\Memory\Tests\Feature\Handlers;
 
 use Orchestra\Memory\Model;
 use Orchestra\Support\Facades\Memory;
-use Orchestra\Memory\TestCase\Feature\TestCase;
+use Orchestra\Memory\Tests\Feature\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class EloquentTest extends TestCase
diff --git a/tests/Feature/Handlers/FluentTest.php b/tests/Feature/Handlers/FluentTest.php
index 9d47714..5158335 100644
--- a/tests/Feature/Handlers/FluentTest.php
+++ b/tests/Feature/Handlers/FluentTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature\Handlers;
+namespace Orchestra\Memory\Tests\Feature\Handlers;
 
 use Illuminate\Support\Facades\DB;
 use Orchestra\Support\Facades\Memory;
-use Orchestra\Memory\TestCase\Feature\TestCase;
+use Orchestra\Memory\Tests\Feature\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class FluentTest extends TestCase
diff --git a/tests/Feature/Handlers/RuntimeTest.php b/tests/Feature/Handlers/RuntimeTest.php
index 9389cf6..92f4578 100644
--- a/tests/Feature/Handlers/RuntimeTest.php
+++ b/tests/Feature/Handlers/RuntimeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature\Handlers;
+namespace Orchestra\Memory\Tests\Feature\Handlers;
 
 use Orchestra\Support\Facades\Memory;
-use Orchestra\Memory\TestCase\Feature\TestCase;
+use Orchestra\Memory\Tests\Feature\TestCase;
 
 class RuntimeTest extends TestCase
 {
diff --git a/tests/Feature/MemorizableTest.php b/tests/Feature/MemorizableTest.php
index c3cdec8..55c80a1 100644
--- a/tests/Feature/MemorizableTest.php
+++ b/tests/Feature/MemorizableTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature;
+namespace Orchestra\Memory\Tests\Feature;
 
 class MemorizableTest extends TestCase
 {
diff --git a/tests/Feature/MemoryManagerTest.php b/tests/Feature/MemoryManagerTest.php
index 9954ee2..7580bda 100644
--- a/tests/Feature/MemoryManagerTest.php
+++ b/tests/Feature/MemoryManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature;
+namespace Orchestra\Memory\Tests\Feature;
 
 use Orchestra\Memory\Handler;
 use Orchestra\Memory\Provider;
diff --git a/tests/Feature/TestCase.php b/tests/Feature/TestCase.php
index f0a6bd8..3e923b7 100644
--- a/tests/Feature/TestCase.php
+++ b/tests/Feature/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Feature;
+namespace Orchestra\Memory\Tests\Feature;
 
 use Orchestra\Testbench\TestCase as Testbench;
 
diff --git a/tests/Unit/HandlerTest.php b/tests/Unit/HandlerTest.php
index dae5fa6..b92d815 100644
--- a/tests/Unit/HandlerTest.php
+++ b/tests/Unit/HandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Unit;
+namespace Orchestra\Memory\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Handlers/RuntimeTest.php b/tests/Unit/Handlers/RuntimeTest.php
index f7583ce..3cd4eb3 100644
--- a/tests/Unit/Handlers/RuntimeTest.php
+++ b/tests/Unit/Handlers/RuntimeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Unit\Handlers;
+namespace Orchestra\Memory\Tests\Unit\Handlers;
 
 use PHPUnit\Framework\TestCase;
 use Orchestra\Memory\Handlers\Runtime;
diff --git a/tests/Unit/ProviderTest.php b/tests/Unit/ProviderTest.php
index 09dfb28..bca9f05 100644
--- a/tests/Unit/ProviderTest.php
+++ b/tests/Unit/ProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Memory\TestCase\Unit;
+namespace Orchestra\Memory\Tests\Unit;
 
 use Mockery as m;
 use Orchestra\Memory\Provider;