diff --git a/tests/RedispatchTest.php b/tests/functional/RedispatchTest.php
similarity index 100%
rename from tests/RedispatchTest.php
rename to tests/functional/RedispatchTest.php
diff --git a/tests/functional/ArgsRemapperTest.php b/tests/unit/ArgsRemapperTest.php
similarity index 86%
rename from tests/functional/ArgsRemapperTest.php
rename to tests/unit/ArgsRemapperTest.php
index d7e2b31781..dc9c19a825 100644
--- a/tests/functional/ArgsRemapperTest.php
+++ b/tests/unit/ArgsRemapperTest.php
@@ -3,13 +3,14 @@
 namespace Unish;
 
 use \Drush\Preflight\ArgsRemapper;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the Arguments Remapper.
  *
  * @group base
  */
-class ArgsRemapperTest extends CommandUnishTestCase
+class ArgsRemapperTest extends TestCase
 {
 
     /**
@@ -29,7 +30,7 @@ public function testCommandAliases($argv, $expected)
     }
 
     /**
-     * Provides argumens for ::ArgsRemapper
+     * Provides arguments for ::ArgsRemapper
      */
     public function argsProvider()
     {
diff --git a/tests/functional/ExpandWildcardTablesUnitTest.php b/tests/unit/ExpandWildcardTablesTest.php
similarity index 88%
rename from tests/functional/ExpandWildcardTablesUnitTest.php
rename to tests/unit/ExpandWildcardTablesTest.php
index 85fc02f754..648b5fcbe6 100644
--- a/tests/functional/ExpandWildcardTablesUnitTest.php
+++ b/tests/unit/ExpandWildcardTablesTest.php
@@ -11,15 +11,13 @@
   * @group base
   * @group sql
   */
-class WildcardUnitCase extends TestCase
+class ExpandWildcardTablesTest extends TestCase
 {
 
     use SqlTableSelectionTrait;
 
   /**
-   * Tests drush_sql_expand_wildcard_tables().
-   *
-   * @see drush_sql_expand_wildcard_tables().
+   * Tests \Drush\Sql\SqlTableSelectionTrait
    */
     public function testExpandWildcardTables()
     {
@@ -49,9 +47,7 @@ public function testExpandWildcardTables()
     }
 
   /**
-   * Tests drush_sql_filter_tables().
-   *
-   * @see drush_sql_filter_tables().
+   * Tests \Drush\Sql\SqlTableSelectionTrait
    */
     public function testFilterTables()
     {
diff --git a/tests/functional/XhUnitTest.php b/tests/unit/XhProfTest.php
similarity index 97%
rename from tests/functional/XhUnitTest.php
rename to tests/unit/XhProfTest.php
index 6e022741ff..cca47e8d94 100644
--- a/tests/functional/XhUnitTest.php
+++ b/tests/unit/XhProfTest.php
@@ -3,13 +3,14 @@
 namespace Unish;
 
 use Drush\Commands\core\XhprofCommands;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for xhCommands
  *
  * @group base
  */
-class XhUnitCase extends UnishTestCase
+class XhProfTest extends TestCase
 {
 
   /**