diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 75910f5..929d99b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,22 +15,30 @@
          printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
     <testsuites>
         <testsuite name="Rinvex Bookings Unit Test Suite">
-            <directory>tests/Unit</directory>
+            <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
-        <testsuite name="Rinvex Bookings Integration Test Suite">
-            <directory>tests/Integration</directory>
+        <testsuite name="Rinvex Bookings Feature Test Suite">
+            <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">src/</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
     <logging>
         <log type="tap" target="build/report.tap" />
         <log type="junit" target="build/report.junit.xml" />
-        <log type="coverage-html" target="build/coverage" />
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true" />
         <log type="coverage-text" target="build/coverage.txt" />
         <log type="coverage-clover" target="build/logs/clover.xml" />
     </logging>
+    <php>
+        <env name="APP_ENV" value="testing" />
+        <env name="CACHE_DRIVER" value="array" />
+        <env name="SESSION_DRIVER" value="array" />
+        <env name="QUEUE_DRIVER" value="sync" />
+        <env name="DB_CONNECTION" value="sqlite" />
+        <env name="DB_DATABASE" value=":memory:" />
+    </php>
 </phpunit>
diff --git a/tests/Integration/.gitkeep b/tests/Feature/.gitkeep
similarity index 100%
rename from tests/Integration/.gitkeep
rename to tests/Feature/.gitkeep