diff --git a/src/test/java/CollectionQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
similarity index 100%
rename from src/test/java/CollectionQueryBuilderTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
diff --git a/src/test/java/DemoUserTest.java b/src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java
similarity index 100%
rename from src/test/java/DemoUserTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java
diff --git a/src/test/java/FileAuditingTest.java b/src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java
similarity index 100%
rename from src/test/java/FileAuditingTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java
diff --git a/src/test/java/KoralNodeTest.java b/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
similarity index 100%
rename from src/test/java/KoralNodeTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
diff --git a/src/test/java/LocalQueryTest.java b/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
similarity index 100%
rename from src/test/java/LocalQueryTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
diff --git a/src/test/java/MetaQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
similarity index 100%
rename from src/test/java/MetaQueryBuilderTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
diff --git a/src/test/java/PublicAPITest.java b/src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java
similarity index 100%
rename from src/test/java/PublicAPITest.java
rename to src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java
diff --git a/src/test/java/ScopesTest.java b/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
similarity index 100%
rename from src/test/java/ScopesTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
diff --git a/src/test/java/SerializationTest.java b/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
similarity index 100%
rename from src/test/java/SerializationTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
diff --git a/src/test/java/ServiceSuite.java b/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
similarity index 100%
rename from src/test/java/ServiceSuite.java
rename to src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
diff --git a/src/test/java/TestNullableSqls.java b/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
similarity index 100%
rename from src/test/java/TestNullableSqls.java
rename to src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java