diff --git a/admin/release-appstarter b/admin/release-appstarter
index 206d17287f30..87281c153693 100644
--- a/admin/release-appstarter
+++ b/admin/release-appstarter
@@ -12,7 +12,7 @@ git checkout $branch
 echo -e "${BOLD}Build the framework distributable${NORMAL}"
 
 echo -e "${BOLD}Copy the main files/folders...${NORMAL}"
-releasable='app public writable README.md contributing.md env license.txt spark'
+releasable='app public writable README.md contributing.md env license.txt spark tests/_support'
 for fff in $releasable ; do
     if [ -d "$fff" ] ; then
         rm -rf $fff
diff --git a/admin/release-framework b/admin/release-framework
index 50ec5f20646b..110da980eaa8 100644
--- a/admin/release-framework
+++ b/admin/release-framework
@@ -12,7 +12,7 @@ git checkout $branch
 echo -e "${BOLD}Build the framework distributable${NORMAL}"
 
 echo -e "${BOLD}Copy the main files/folders...${NORMAL}"
-releasable='app docs public system writable contributing.md env license.txt spark'
+releasable='app docs public system writable contributing.md env license.txt spark tests/_support'
 for fff in $releasable ; do
     if [ -d "$fff" ] ; then
         rm -rf $fff
diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist
new file mode 100644
index 000000000000..73d51ffc8dee
--- /dev/null
+++ b/admin/starter/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="tests/_support/_bootstrap.php"
+        backupGlobals="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        stopOnError="false"
+        stopOnFailure="false"
+        stopOnIncomplete="false"
+        stopOnSkipped="false">
+    <testsuites>
+        <testsuite name="app">
+            <directory>./tests</directory>
+            <exclude>./tests/system</exclude>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./system</directory>
+            <exclude>
+                <directory>./system</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
+</phpunit>
diff --git a/tests/_support/Helpers/ControllerResponse.php b/system/Test/ControllerResponse.php
similarity index 62%
rename from tests/_support/Helpers/ControllerResponse.php
rename to system/Test/ControllerResponse.php
index 4c64a524a002..393fb879c01c 100644
--- a/tests/_support/Helpers/ControllerResponse.php
+++ b/system/Test/ControllerResponse.php
@@ -1,6 +1,41 @@
-<?php namespace Tests\Support\Helpers;
+<?php namespace CodeIgniter\Test;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 3.0.0
+ * @filesource
+ */
 
-use Tests\Support\DOM\DOMParser;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
diff --git a/tests/_support/Helpers/ControllerTester.php b/system/Test/ControllerTester.php
similarity index 66%
rename from tests/_support/Helpers/ControllerTester.php
rename to system/Test/ControllerTester.php
index 66e95f3c289e..5af730896c6c 100644
--- a/tests/_support/Helpers/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -1,4 +1,40 @@
-<?php namespace Tests\Support\Helpers;
+<?php namespace CodeIgniter\Test;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 3.0.0
+ * @filesource
+ */
 
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
@@ -73,7 +109,7 @@ public function controller(string $name)
 	 * @param string $method
 	 * @param array  $params
 	 *
-	 * @return \Tests\Support\Helpers\ControllerResponse
+	 * @return \CodeIgniter\TestControllerResponse
 	 */
 	public function execute(string $method, ...$params)
 	{
diff --git a/tests/_support/DOM/DOMParser.php b/system/Test/DOMParser.php
similarity index 78%
rename from tests/_support/DOM/DOMParser.php
rename to system/Test/DOMParser.php
index 3a190faf4364..55bd10eff96a 100644
--- a/tests/_support/DOM/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -1,4 +1,40 @@
-<?php namespace Tests\Support\DOM;
+<?php namespace CodeIgniter\Test;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 3.0.0
+ * @filesource
+ */
 
 class DOMParser
 {
@@ -59,7 +95,7 @@ public function withString(string $content)
 	 *
 	 * @param string $path
 	 *
-	 * @return \Tests\Support\DOM\DOMParser
+	 * @return \CodeIgniter\Test\DOMParser
 	 */
 	public function withFile(string $path)
 	{
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
index e4a31f30836a..3a606724521b 100644
--- a/system/Test/FeatureResponse.php
+++ b/system/Test/FeatureResponse.php
@@ -3,7 +3,6 @@
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use PHPUnit\Framework\TestCase;
-use Tests\Support\DOM\DOMParser;
 
 class FeatureResponse extends TestCase
 {
@@ -13,7 +12,7 @@ class FeatureResponse extends TestCase
 	public $response;
 
 	/**
-	 * @var \Tests\Support\DOM\DOMParser
+	 * @var \CodeIgniter\Test\DOMParser
 	 */
 	protected $domParser;
 
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index d5b624a3b645..186cfc7bb66d 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -4,6 +4,9 @@
 use CodeIgniter\Database\SQLite3\Table;
 use Config\Database;
 
+/**
+ * @group DatabaseLive
+ */
 class AlterTableTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 5216f06a5691..33fb2bc5628e 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -349,7 +349,7 @@ public function testRealPathInvalid()
 
 	public function testRealPathResolved()
 	{
-		$this->assertEquals(SUPPORTPATH . 'Helpers/', set_realpath(SUPPORTPATH . 'Files/../Helpers', true));
+		$this->assertEquals(SUPPORTPATH . 'Models/', set_realpath(SUPPORTPATH . 'Files/../Models', true));
 	}
 
 }
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 07c42c20f692..8bd9b1479b52 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -1,7 +1,5 @@
 <?php namespace CodeIgniter\Test;
 
-use Tests\Support\DOM\DOMParser;
-
 class DOMParserTest extends CIUnitTestCase
 {
 	protected function setUp()
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index d4c6819ab7e3..21615673d18f 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -18,7 +18,7 @@ within your tests::
 
     <?php namespace CodeIgniter;
 
-    use Tests\Support\Helpers\ControllerTester;
+    use CodeIgniter\Test\ControllerTester;
 
     class TestControllerA extends \CIDatabaseTestCase
     {
@@ -32,7 +32,7 @@ to run as the parameter::
 
     <?php namespace CodeIgniter;
 
-    use Tests\Support\Helpers\ControllerTester;
+    use CodeIgniter\Test\ControllerTester;
 
     class TestControllerA extends \CIDatabaseTestCase
     {