diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/AnnisQueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/AnnisQueryProcessorTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/Cosmas2QueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/Cosmas2QueryProcessorTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java b/src/test/java/de/ids_mannheim/korap/query/test/EmptyResultsTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/EmptyResultsTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/EmptyResultsTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java b/src/test/java/de/ids_mannheim/korap/query/test/collection/CollectionQueryDuplicateTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryDuplicateTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/collection/CollectionQueryDuplicateTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/collection/CollectionQueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/collection/CollectionQueryProcessorTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/FCSQLComplexTest.java b/src/test/java/de/ids_mannheim/korap/query/test/fcsql/FCSQLComplexTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/FCSQLComplexTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/fcsql/FCSQLComplexTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/fcsql/FCSQLQueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/fcsql/FCSQLQueryProcessorTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/poliqarpplus/PoliqarpPlusQueryProcessorTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/test/poliqarpplus/PoliqarpPlusQueryProcessorTest.java