diff --git a/src/test/SearchIterator.java b/test/adql/SearchIterator.java
similarity index 99%
rename from src/test/SearchIterator.java
rename to test/adql/SearchIterator.java
index bf991b6108ee43fa4cd99d5cf5370659c2967b4e..f22a14b1c29eba74cce1284af46cadc51eb32b04 100644
--- a/src/test/SearchIterator.java
+++ b/test/adql/SearchIterator.java
@@ -1,4 +1,4 @@
-package test;
+package adql;
 
 /*
  * This file is part of ADQLLibrary.
diff --git a/src/test/SearchResult.java b/test/adql/SearchResult.java
similarity index 99%
rename from src/test/SearchResult.java
rename to test/adql/SearchResult.java
index e9d0aa0c18bed367d16298b5bf0e3c68faf7bab3..2da101490df98a2d7c3c1129369cf134dd7ab698 100644
--- a/src/test/SearchResult.java
+++ b/test/adql/SearchResult.java
@@ -1,4 +1,4 @@
-package test;
+package adql;
 
 /*
  * This file is part of ADQLLibrary.
diff --git a/src/test/TestADQLQuery.java b/test/adql/TestADQLQuery.java
similarity index 99%
rename from src/test/TestADQLQuery.java
rename to test/adql/TestADQLQuery.java
index 8d61f87aed1d71c1c96e8fa0aee6785fd85f8c7f..9e957b0192d6327f80c21fe2f5acfcf700398750 100644
--- a/src/test/TestADQLQuery.java
+++ b/test/adql/TestADQLQuery.java
@@ -1,4 +1,4 @@
-package test;
+package adql;
 
 import java.util.Iterator;
 
diff --git a/src/test/TestIN.java b/test/adql/TestIN.java
similarity index 99%
rename from src/test/TestIN.java
rename to test/adql/TestIN.java
index de6d45aca24b4647151c11913c74d5562c339c5a..789391a8ea95c514104f42c60467080c13023bf4 100644
--- a/src/test/TestIN.java
+++ b/test/adql/TestIN.java
@@ -1,4 +1,4 @@
-package test;
+package adql;
 
 import java.util.Iterator;