diff --git a/config/modular.php b/config/modular.php
index 03fbf15..623b843 100644
--- a/config/modular.php
+++ b/config/modular.php
@@ -28,6 +28,7 @@
         'resources/css',
         'routes',
         'storage',
-        'tests',
+        'tests/Feature',
+        'tests/Unit',
     ],
 ];
diff --git a/src/Commands/JobMakeCommand.php b/src/Commands/JobMakeCommand.php
new file mode 100644
index 0000000..759bb57
--- /dev/null
+++ b/src/Commands/JobMakeCommand.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Savannabits\Modular\Commands;
+
+use Savannabits\Modular\Support\Concerns\GeneratesModularFiles;
+
+class JobMakeCommand extends \Illuminate\Foundation\Console\JobMakeCommand
+{
+    use GeneratesModularFiles;
+
+    protected $name = 'modular:make-job';
+
+    protected $description = 'Create a new job class in a modular package';
+
+    protected function getRelativeNamespace(): string
+    {
+        return 'Jobs';
+    }
+}
diff --git a/src/Commands/ModuleMakeCommand.php b/src/Commands/ModuleMakeCommand.php
index 8d27e93..54c4b65 100644
--- a/src/Commands/ModuleMakeCommand.php
+++ b/src/Commands/ModuleMakeCommand.php
@@ -73,7 +73,7 @@ private function generateModuleFiles(): void
         } catch (FileNotFoundException|NotFoundExceptionInterface|ContainerExceptionInterface $e) {
             $this->error($e->getMessage());
         }
-        //        $this->generateModuleFacade();
+        $this->generatePestFiles();
     }
 
     private function generateModuleComposerFile(): void
@@ -134,6 +134,27 @@ private function generateModuleServiceProvider(): void
         ]);
     }
 
+    private function generatePestFiles(): void
+    {
+        // phpunit.xml
+        $path = Modular::module($this->moduleName)->path('phpunit.xml');
+        $this->copyStubToApp('phpunit', $path, [
+            'moduleName' => $this->moduleStudlyName,
+        ]);
+
+        // Pest.php
+        $path = Modular::module($this->moduleName)->testsPath('Pest.php');
+        $this->copyStubToApp('pest.class', $path, [
+            'namespace' => $this->moduleNamespace,
+        ]);
+
+        // TestCase.php
+        $path = Modular::module($this->moduleName)->testsPath('TestCase.php');
+        $this->copyStubToApp('test-case', $path, [
+            'namespace' => $this->moduleNamespace.'\\Tests',
+        ]);
+    }
+
     private function installModule(): void
     {
         $this->comment('Activating the new Module');
diff --git a/src/Commands/TestMakeCommand.php b/src/Commands/TestMakeCommand.php
new file mode 100644
index 0000000..88628c4
--- /dev/null
+++ b/src/Commands/TestMakeCommand.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Savannabits\Modular\Commands;
+
+use Illuminate\Support\Str;
+use Savannabits\Modular\Support\Concerns\GeneratesModularFiles;
+
+class TestMakeCommand extends \Illuminate\Foundation\Console\TestMakeCommand
+{
+    use GeneratesModularFiles;
+
+    protected $name = 'modular:make-test';
+
+    protected $description = 'Create a new test class in a modular package';
+
+    protected function getPath($name): string
+    {
+        $name = Str::replaceFirst($this->rootNamespace(), '', $name);
+
+        return $this->getModule()->testsPath(str_replace('\\', '/', $name).'.php');
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     */
+    protected function getDefaultNamespace($rootNamespace): string
+    {
+        if ($this->option('unit')) {
+            return $rootNamespace.'\Unit';
+        } else {
+            return $rootNamespace.'\Feature';
+        }
+    }
+}
diff --git a/src/Module.php b/src/Module.php
index f324850..8139b94 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -119,4 +119,14 @@ public function resourcePath(string $string, bool $relative = false): string
     {
         return $this->path('resources'.DIRECTORY_SEPARATOR.trim($string, DIRECTORY_SEPARATOR), $relative);
     }
+
+    public function testsPath(string $string, bool $relative = false): string
+    {
+        return $this->path('tests'.DIRECTORY_SEPARATOR.trim($string, DIRECTORY_SEPARATOR), $relative);
+    }
+
+    public function getBaseProviderClass(): string
+    {
+        return $this->makeNamespace('\\'.$this->studlyName.'ServiceProvider');
+    }
 }
diff --git a/stubs/pest.class.stub b/stubs/pest.class.stub
new file mode 100644
index 0000000..68bf05d
--- /dev/null
+++ b/stubs/pest.class.stub
@@ -0,0 +1,48 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Test Case
+|--------------------------------------------------------------------------
+|
+| The closure you provide to your test functions is always bound to a specific PHPUnit test
+| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
+| need to change it using the "uses()" function to bind a different classes or traits.
+|
+*/
+
+uses(
+    {{ namespace }}\Tests\TestCase::class,
+    // Illuminate\Foundation\Testing\RefreshDatabase::class,
+)->in(__DIR__);
+
+/*
+|--------------------------------------------------------------------------
+| Expectations
+|--------------------------------------------------------------------------
+|
+| When you're writing tests, you often need to check that values meet certain conditions. The
+| "expect()" function gives you access to a set of "expectations" methods that you can use
+| to assert different things. Of course, you may extend the Expectation API at any time.
+|
+*/
+
+expect()->extend('toBeOne', function () {
+    return $this->toBe(1);
+});
+
+/*
+|--------------------------------------------------------------------------
+| Functions
+|--------------------------------------------------------------------------
+|
+| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
+| project that you don't want to repeat in every file. Here you can also expose helpers as
+| global functions to help you to reduce the number of lines of code in your test files.
+|
+*/
+
+function something()
+{
+    // ..
+}
diff --git a/stubs/phpunit.stub b/stubs/phpunit.stub
new file mode 100644
index 0000000..ec4f59f
--- /dev/null
+++ b/stubs/phpunit.stub
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+>
+    <testsuites>
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Feature">
+            <directory>tests/Feature</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory>app</directory>
+        </include>
+    </source>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="APP_MAINTENANCE_DRIVER" value="file"/>
+        <env name="BCRYPT_ROUNDS" value="4"/>
+        <env name="CACHE_STORE" value="array"/>
+        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
+        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="MAIL_MAILER" value="array"/>
+        <env name="PULSE_ENABLED" value="false"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="TELESCOPE_ENABLED" value="false"/>
+    </php>
+</phpunit>
diff --git a/stubs/test-case.stub b/stubs/test-case.stub
new file mode 100644
index 0000000..9e74331
--- /dev/null
+++ b/stubs/test-case.stub
@@ -0,0 +1,10 @@
+<?php
+
+namespace {{ namespace }};
+
+use Orchestra\Testbench\TestCase as Orchestra;
+
+abstract class TestCase extends Orchestra
+{
+    //
+}