diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index 8a7bb49827ad776d1cfadfca35e970a3b984072b..8ee78ccb18f834aa0bd4ea25eb41355f1a6dcbef 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -316,7 +316,7 @@
   		<param name="failure.property" value="tests.failed" />
   	</antcall>
   	<antcall target="_run-testng">
-  		<param name="test.suite" value="tests_system_cleandb_without_authorization.xml" />
+  		<param name="test.suite" value="tests_system_cleandb_excluding_authorization.xml" />
   		<param name="failure.property" value="tests.failed" />
   	</antcall>
   				
@@ -327,7 +327,7 @@
   		<report format="noframes" todir="${output.test}" />
   	</junitreport>
   	<fail if="tests.failed" message="At least one test failed." />
-		<antcall target="check-restrictions" />
+		<!--antcall target="check-restrictions" /-->
   </target>
 
 
diff --git a/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization.xml b/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3ff9b600fb58adcd4a30252b5620b02182c27530
--- /dev/null
+++ b/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization.xml
@@ -0,0 +1,14 @@
+<suite name="All" verbose="2" parallel = "false" threadCount = "1">
+  <test name="system-cleandb" annotations="JDK">
+    <groups>
+      <run>
+        <include name="system-cleandb"/>
+        <exclude name="authorization"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="ch.systemsx.cisd.openbis.systemtest.*" />
+    </packages>
+  </test>
+  
+</suite>