diff --git a/tests/Functional/Providers/CommandServiceProviderTest.php b/tests/Functional/Console/CommandServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Providers/CommandServiceProviderTest.php
rename to tests/Functional/Console/CommandServiceProviderTest.php
diff --git a/tests/Functional/Abstract/Commands/ListActionsTest.php b/tests/Functional/Console/Commands/ListActionsTest.php
similarity index 100%
rename from tests/Functional/Abstract/Commands/ListActionsTest.php
rename to tests/Functional/Console/Commands/ListActionsTest.php
diff --git a/tests/Functional/Abstract/Commands/ListTasksTest.php b/tests/Functional/Console/Commands/ListTasksTest.php
similarity index 100%
rename from tests/Functional/Abstract/Commands/ListTasksTest.php
rename to tests/Functional/Console/Commands/ListTasksTest.php
diff --git a/tests/Functional/Configuration/ApplicationBuilderTest.php b/tests/Functional/Foundation/Configuration/ApplicationBuilderTest.php
similarity index 100%
rename from tests/Functional/Configuration/ApplicationBuilderTest.php
rename to tests/Functional/Foundation/Configuration/ApplicationBuilderTest.php
diff --git a/tests/Functional/Providers/ApiatoServiceProviderTest.php b/tests/Functional/Foundation/Providers/ApiatoServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Providers/ApiatoServiceProviderTest.php
rename to tests/Functional/Foundation/Providers/ApiatoServiceProviderTest.php
diff --git a/tests/Functional/Support/Providers/ConfigServiceProviderTest.php b/tests/Functional/Foundation/Support/Providers/ConfigServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Support/Providers/ConfigServiceProviderTest.php
rename to tests/Functional/Foundation/Support/Providers/ConfigServiceProviderTest.php
diff --git a/tests/Functional/Support/Providers/HelperServiceProviderTest.php b/tests/Functional/Foundation/Support/Providers/HelperServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Support/Providers/HelperServiceProviderTest.php
rename to tests/Functional/Foundation/Support/Providers/HelperServiceProviderTest.php
diff --git a/tests/Functional/Support/Providers/LocalizationServiceProviderTest.php b/tests/Functional/Foundation/Support/Providers/LocalizationServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Support/Providers/LocalizationServiceProviderTest.php
rename to tests/Functional/Foundation/Support/Providers/LocalizationServiceProviderTest.php
diff --git a/tests/Functional/Support/Providers/MigrationServiceProviderTest.php b/tests/Functional/Foundation/Support/Providers/MigrationServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Support/Providers/MigrationServiceProviderTest.php
rename to tests/Functional/Foundation/Support/Providers/MigrationServiceProviderTest.php
diff --git a/tests/Functional/Support/Providers/ViewServiceProviderTest.php b/tests/Functional/Foundation/Support/Providers/ViewServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Support/Providers/ViewServiceProviderTest.php
rename to tests/Functional/Foundation/Support/Providers/ViewServiceProviderTest.php
diff --git a/tests/Functional/Providers/MacroServiceProviderTest.php b/tests/Functional/Macros/MacroServiceProviderTest.php
similarity index 100%
rename from tests/Functional/Providers/MacroServiceProviderTest.php
rename to tests/Functional/Macros/MacroServiceProviderTest.php
diff --git a/tests/Unit/Support/HelpersTest.php b/tests/Unit/Foundation/HelpersTest.php
similarity index 100%
rename from tests/Unit/Support/HelpersTest.php
rename to tests/Unit/Foundation/HelpersTest.php
diff --git a/tests/Unit/Support/Middleware/ProcessETagTest.php b/tests/Unit/Http/Middleware/ProcessETagTest.php
similarity index 100%
rename from tests/Unit/Support/Middleware/ProcessETagTest.php
rename to tests/Unit/Http/Middleware/ProcessETagTest.php
diff --git a/tests/Unit/Support/Middleware/ValidateJsonContentTest.php b/tests/Unit/Http/Middleware/ValidateJsonContentTest.php
similarity index 100%
rename from tests/Unit/Support/Middleware/ValidateJsonContentTest.php
rename to tests/Unit/Http/Middleware/ValidateJsonContentTest.php
diff --git a/tests/Unit/Support/ResponseTest.php b/tests/Unit/Http/ResponseTest.php
similarity index 100%
rename from tests/Unit/Support/ResponseTest.php
rename to tests/Unit/Http/ResponseTest.php