diff --git a/src/Generators/FeatureTestGenerator.php b/src/Generators/FeatureTestGenerator.php
index aa48f2b..15c0ae5 100644
--- a/src/Generators/FeatureTestGenerator.php
+++ b/src/Generators/FeatureTestGenerator.php
@@ -24,7 +24,7 @@ class FeatureTestGenerator extends BaseGenerator
 
         $this->generateFile(
             "{$featureTestPath}/Manage{$this->modelNames['plural_model_name']}Test.php",
-            $this->getContent('test-feature-'.$type)
+            $this->getContent('tests/feature/'.$type)
         );
 
         $this->command->info('Manage'.$this->modelNames['plural_model_name'].'Test generated.');
@@ -77,6 +77,6 @@ class FeatureTestGenerator extends BaseGenerator
      */
     public function getBrowserKitBaseTestContent()
     {
-        return $this->files->get(__DIR__.'/../stubs/test-browserkit-base-class.stub');
+        return $this->files->get(__DIR__.'/../stubs/tests/browserkit-base-class.stub');
     }
 }
diff --git a/src/Generators/ModelPolicyTestGenerator.php b/src/Generators/ModelPolicyTestGenerator.php
index c45f2a5..fdbd505 100644
--- a/src/Generators/ModelPolicyTestGenerator.php
+++ b/src/Generators/ModelPolicyTestGenerator.php
@@ -16,7 +16,7 @@ class ModelPolicyTestGenerator extends BaseGenerator
 
         $this->generateFile(
             "{$modelPolicyTestPath}/{$this->modelNames['model_name']}PolicyTest.php",
-            $this->getContent('test-policy')
+            $this->getContent('tests/unit/model-policy')
         );
 
         $this->command->info($this->modelNames['model_name'].'PolicyTest (model policy) generated.');
diff --git a/src/Generators/ModelTestGenerator.php b/src/Generators/ModelTestGenerator.php
index 3df67a8..6445442 100644
--- a/src/Generators/ModelTestGenerator.php
+++ b/src/Generators/ModelTestGenerator.php
@@ -16,7 +16,7 @@ class ModelTestGenerator extends BaseGenerator
 
         $this->generateFile(
             "{$unitTestPath}/{$this->modelNames['model_name']}Test.php",
-            $this->getContent('test-unit')
+            $this->getContent('tests/unit/model')
         );
 
         $this->command->info($this->modelNames['model_name'].'Test (model) generated.');
diff --git a/src/stubs/test-browserkit-base-class.stub b/src/stubs/tests/browserkit-base-class.stub
similarity index 100%
rename from src/stubs/test-browserkit-base-class.stub
rename to src/stubs/tests/browserkit-base-class.stub
diff --git a/src/stubs/test-feature-api.stub b/src/stubs/tests/feature/api.stub
similarity index 100%
rename from src/stubs/test-feature-api.stub
rename to src/stubs/tests/feature/api.stub
diff --git a/src/stubs/test-feature-full.stub b/src/stubs/tests/feature/full.stub
similarity index 100%
rename from src/stubs/test-feature-full.stub
rename to src/stubs/tests/feature/full.stub
diff --git a/src/stubs/test-feature-simple.stub b/src/stubs/tests/feature/simple.stub
similarity index 100%
rename from src/stubs/test-feature-simple.stub
rename to src/stubs/tests/feature/simple.stub
diff --git a/src/stubs/test-policy.stub b/src/stubs/tests/unit/model-policy.stub
similarity index 100%
rename from src/stubs/test-policy.stub
rename to src/stubs/tests/unit/model-policy.stub
diff --git a/src/stubs/test-unit.stub b/src/stubs/tests/unit/model.stub
similarity index 100%
rename from src/stubs/test-unit.stub
rename to src/stubs/tests/unit/model.stub