diff --git a/.gitattributes b/.gitattributes
index ff0ef10..4037851 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,4 +6,4 @@ screenshots export-ignore
 .travis.yml export-ignore
 phpunit.xml export-ignore
 readme.md export-ignore
-tests/*/** export-ignore
\ No newline at end of file
+tests export-ignore
\ No newline at end of file
diff --git a/src/Generators/FeatureTestGenerator.php b/src/Generators/FeatureTestGenerator.php
index 15c0ae5..5742d9c 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('tests/feature/'.$type)
+            $this->getContent('testcases/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/tests/browserkit-base-class.stub');
+        return $this->files->get(__DIR__.'/../stubs/testcases/browserkit-base-class.stub');
     }
 }
diff --git a/src/Generators/ModelPolicyTestGenerator.php b/src/Generators/ModelPolicyTestGenerator.php
index fdbd505..6b729fe 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('tests/unit/model-policy')
+            $this->getContent('testcases/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 6445442..c80f0d2 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('tests/unit/model')
+            $this->getContent('testcases/unit/model')
         );
 
         $this->command->info($this->modelNames['model_name'].'Test (model) generated.');
diff --git a/src/stubs/tests/browserkit-base-class.stub b/src/stubs/testcases/browserkit-base-class.stub
similarity index 100%
rename from src/stubs/tests/browserkit-base-class.stub
rename to src/stubs/testcases/browserkit-base-class.stub
diff --git a/src/stubs/tests/feature/api.stub b/src/stubs/testcases/feature/api.stub
similarity index 100%
rename from src/stubs/tests/feature/api.stub
rename to src/stubs/testcases/feature/api.stub
diff --git a/src/stubs/tests/feature/full.stub b/src/stubs/testcases/feature/full.stub
similarity index 100%
rename from src/stubs/tests/feature/full.stub
rename to src/stubs/testcases/feature/full.stub
diff --git a/src/stubs/tests/feature/simple.stub b/src/stubs/testcases/feature/simple.stub
similarity index 100%
rename from src/stubs/tests/feature/simple.stub
rename to src/stubs/testcases/feature/simple.stub
diff --git a/src/stubs/tests/unit/model-policy.stub b/src/stubs/testcases/unit/model-policy.stub
similarity index 100%
rename from src/stubs/tests/unit/model-policy.stub
rename to src/stubs/testcases/unit/model-policy.stub
diff --git a/src/stubs/tests/unit/model.stub b/src/stubs/testcases/unit/model.stub
similarity index 100%
rename from src/stubs/tests/unit/model.stub
rename to src/stubs/testcases/unit/model.stub