diff --git a/tests/QueryAggregateValueTestCase.php b/tests/Query/AggregateValueTestCase.php
similarity index 100%
rename from tests/QueryAggregateValueTestCase.php
rename to tests/Query/AggregateValueTestCase.php
diff --git a/tests/QueryComponentAliasTestCase.php b/tests/Query/ComponentAliasTestCase.php
similarity index 100%
rename from tests/QueryComponentAliasTestCase.php
rename to tests/Query/ComponentAliasTestCase.php
diff --git a/tests/QueryConditionTestCase.php b/tests/Query/ConditionTestCase.php
similarity index 100%
rename from tests/QueryConditionTestCase.php
rename to tests/Query/ConditionTestCase.php
diff --git a/tests/QueryDeleteTestCase.php b/tests/Query/DeleteTestCase.php
similarity index 100%
rename from tests/QueryDeleteTestCase.php
rename to tests/Query/DeleteTestCase.php
diff --git a/tests/QueryFromTestCase.php b/tests/Query/FromTestCase.php
similarity index 100%
rename from tests/QueryFromTestCase.php
rename to tests/Query/FromTestCase.php
diff --git a/tests/QueryIdentifierQuotingTestCase.php b/tests/Query/IdentifierQuotingTestCase.php
similarity index 100%
rename from tests/QueryIdentifierQuotingTestCase.php
rename to tests/Query/IdentifierQuotingTestCase.php
diff --git a/tests/QueryLimitTestCase.php b/tests/Query/LimitTestCase.php
similarity index 100%
rename from tests/QueryLimitTestCase.php
rename to tests/Query/LimitTestCase.php
diff --git a/tests/QueryMultiJoinTestCase.php b/tests/Query/MultiJoinTestCase.php
similarity index 100%
rename from tests/QueryMultiJoinTestCase.php
rename to tests/Query/MultiJoinTestCase.php
diff --git a/tests/QueryReferenceModelTestCase.php b/tests/Query/ReferenceModelTestCase.php
similarity index 100%
rename from tests/QueryReferenceModelTestCase.php
rename to tests/Query/ReferenceModelTestCase.php
diff --git a/tests/QuerySelectTestCase.php b/tests/Query/SelectTestCase.php
similarity index 100%
rename from tests/QuerySelectTestCase.php
rename to tests/Query/SelectTestCase.php
diff --git a/tests/QueryShortAliasesTestCase.php b/tests/Query/ShortAliasesTestCase.php
similarity index 100%
rename from tests/QueryShortAliasesTestCase.php
rename to tests/Query/ShortAliasesTestCase.php
diff --git a/tests/QuerySubqueryTestCase.php b/tests/Query/SubqueryTestCase.php
similarity index 100%
rename from tests/QuerySubqueryTestCase.php
rename to tests/Query/SubqueryTestCase.php
diff --git a/tests/QueryUpdateTestCase.php b/tests/Query/UpdateTestCase.php
similarity index 100%
rename from tests/QueryUpdateTestCase.php
rename to tests/Query/UpdateTestCase.php
diff --git a/tests/QueryWhereTestCase.php b/tests/Query/WhereTestCase.php
similarity index 100%
rename from tests/QueryWhereTestCase.php
rename to tests/Query/WhereTestCase.php