diff --git a/openbis/sourceTest/java/tests.xml b/openbis/sourceTest/java/tests.xml
index d3fbd3cc88c97b988a55f817a15370e5ca2a34f0..8552100ae2b1e43680c7f794f76171f929db5e36 100644
--- a/openbis/sourceTest/java/tests.xml
+++ b/openbis/sourceTest/java/tests.xml
@@ -1,5 +1,5 @@
 <suite name="All" verbose="2" >
-  <test name="All" annotations="JDK">
+  <test name="unit" annotations="JDK">
     <groups>
       <run>
         <exclude name="abstract" />
@@ -11,7 +11,25 @@
     <packages>
       <package name="ch.systemsx.cisd.openbis.*">
         <exclude name="ch.systemsx.cisd.openbis.common.*" />
-      </package>
+        <exclude name="ch.systemsx.cisd.openbis.remoteapitest.*" />
+        <exclude name="ch.systemsx.cisd.openbis.systemtest.*" />
+      </package>      
+    </packages>     
+  </test>
+  
+  <test name="system" annotations="JDK">
+    <groups>
+      <run>
+        <exclude name="abstract" />
+        <exclude name="broken" />
+        <exclude name="scalability"/>
+        <exclude name="system-cleandb"/>
+      </run>
+    </groups>
+    <packages>
+        <package name="ch.systemsx.cisd.openbis.remoteapitest.*" />
+        <package name="ch.systemsx.cisd.openbis.systemtest.*" />
     </packages>
   </test>
+  
 </suite>