diff --git a/.classpath b/.classpath
index 543fb7f..9764692 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="src/|build/|schema/|etc/|src/|lib/|pkgdata/|ServiceFiles/|design/" kind="src" path=""/>
+	<classpathentry excluding="src/|build/|schema/|etc/|src/|lib/|pkgdata/|ServiceFiles/|design/|test/" kind="src" path=""/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/GCORELIBS"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/EXISTLIBS"/>
diff --git a/src/org/gcube/informationsystem/collector/test/GCUBEInstanceStateResourceTest.java b/test/org/gcube/informationsystem/collector/GCUBEInstanceStateResourceTest.java
similarity index 97%
rename from src/org/gcube/informationsystem/collector/test/GCUBEInstanceStateResourceTest.java
rename to test/org/gcube/informationsystem/collector/GCUBEInstanceStateResourceTest.java
index eb64c6e..8b802fe 100644
--- a/src/org/gcube/informationsystem/collector/test/GCUBEInstanceStateResourceTest.java
+++ b/test/org/gcube/informationsystem/collector/GCUBEInstanceStateResourceTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.collector.test;
+package org.gcube.informationsystem.collector;
 
 import org.gcube.informationsystem.collector.impl.resources.GCUBEInstanceStateResource;
 import org.gcube.informationsystem.collector.impl.resources.DAIXResource.MalformedResourceException;
diff --git a/src/org/gcube/informationsystem/collector/test/GCUBEProfileResourceTest.java b/test/org/gcube/informationsystem/collector/GCUBEProfileResourceTest.java
similarity index 98%
rename from src/org/gcube/informationsystem/collector/test/GCUBEProfileResourceTest.java
rename to test/org/gcube/informationsystem/collector/GCUBEProfileResourceTest.java
index 82be2ce..d684a79 100644
--- a/src/org/gcube/informationsystem/collector/test/GCUBEProfileResourceTest.java
+++ b/test/org/gcube/informationsystem/collector/GCUBEProfileResourceTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.collector.test;
+package org.gcube.informationsystem.collector;
 
 import java.io.StringReader;
 
diff --git a/src/org/gcube/informationsystem/collector/test/GCUBEXMLResourceTest.java b/test/org/gcube/informationsystem/collector/GCUBEXMLResourceTest.java
similarity index 98%
rename from src/org/gcube/informationsystem/collector/test/GCUBEXMLResourceTest.java
rename to test/org/gcube/informationsystem/collector/GCUBEXMLResourceTest.java
index e276ef3..7cb9334 100644
--- a/src/org/gcube/informationsystem/collector/test/GCUBEXMLResourceTest.java
+++ b/test/org/gcube/informationsystem/collector/GCUBEXMLResourceTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.collector.test;
+package org.gcube.informationsystem.collector;
 
 import junit.framework.TestCase;
 
diff --git a/src/org/gcube/informationsystem/collector/test/MetadataReaderTest.java b/test/org/gcube/informationsystem/collector/MetadataReaderTest.java
similarity index 97%
rename from src/org/gcube/informationsystem/collector/test/MetadataReaderTest.java
rename to test/org/gcube/informationsystem/collector/MetadataReaderTest.java
index 263d886..532ac9a 100644
--- a/src/org/gcube/informationsystem/collector/test/MetadataReaderTest.java
+++ b/test/org/gcube/informationsystem/collector/MetadataReaderTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.collector.test;
+package org.gcube.informationsystem.collector;
 
 import java.io.IOException;
 
diff --git a/src/org/gcube/informationsystem/collector/test/XMLStorageManagerTest.java b/test/org/gcube/informationsystem/collector/XMLStorageManagerTest.java
similarity index 99%
rename from src/org/gcube/informationsystem/collector/test/XMLStorageManagerTest.java
rename to test/org/gcube/informationsystem/collector/XMLStorageManagerTest.java
index 2514d5c..3e850b1 100644
--- a/src/org/gcube/informationsystem/collector/test/XMLStorageManagerTest.java
+++ b/test/org/gcube/informationsystem/collector/XMLStorageManagerTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.collector.test;
+package org.gcube.informationsystem.collector;
 
 import org.gcube.informationsystem.collector.impl.resources.GCUBEInstanceStateResource;
 import org.gcube.informationsystem.collector.impl.resources.GCUBEProfileResource;