diff --git a/tests/TestCase/Database/CommonTableExpressionQueryTests.php b/tests/TestCase/Database/QueryTests/CommonTableExpressionQueryTests.php
similarity index 99%
rename from tests/TestCase/Database/CommonTableExpressionQueryTests.php
rename to tests/TestCase/Database/QueryTests/CommonTableExpressionQueryTests.php
index a62c095b512..eee5fb57e37 100644
--- a/tests/TestCase/Database/CommonTableExpressionQueryTests.php
+++ b/tests/TestCase/Database/QueryTests/CommonTableExpressionQueryTests.php
@@ -14,7 +14,7 @@
  * @since         4.1.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Database;
+namespace Cake\Test\TestCase\Database\QueryTests;
 
 use Cake\Database\Driver\Mysql;
 use Cake\Database\Driver\Sqlite;
diff --git a/tests/TestCase/Database/WindowQueryTests.php b/tests/TestCase/Database/QueryTests/WindowQueryTests.php
similarity index 99%
rename from tests/TestCase/Database/WindowQueryTests.php
rename to tests/TestCase/Database/QueryTests/WindowQueryTests.php
index 4cac2a98832..1ac1fbb51b3 100644
--- a/tests/TestCase/Database/WindowQueryTests.php
+++ b/tests/TestCase/Database/QueryTests/WindowQueryTests.php
@@ -13,7 +13,7 @@
  * @since         4.1.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Database;
+namespace Cake\Test\TestCase\Database\QueryTests;
 
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\Expression\WindowExpression;