diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index 8ed952349cd2d1982ec7b320cde7adf421612837..382d4c91b76aee98ca8dc063896ef11619786591 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -34,10 +34,9 @@ repositories {
 }
 
 test {
-	useTestNG {
-		suites = ['sourceTest/java/tests.xml']
-	}
-	
+	useTestNG()
+	options.suites('sourceTest/java/tests.xml')	
+
 	jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
 	
 	testLogging.showStandardStreams = true
diff --git a/openbis/build.gradle b/openbis/build.gradle
index 2a75120723c1000f56c61846e8db2917fa2412d0..c473840f10c7311f9dafe00593d1e21abe22ae7d 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -115,6 +115,13 @@ sourceSets {
 	}
 }
 
+
+task cleanDbSuite(type: Test) {
+	useTestNG()
+	options.suites('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+}
+
+
 // This task is here to make WebAppsPropertiesTest to work. It requires some data files
 // to be present on the same directory than the class file itself.
 task copyTestData(type: Copy, dependsOn: testClasses) {
@@ -123,6 +130,8 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
     include '*.properties'
 }
 test.dependsOn(copyTestData)
+test.dependsOn(cleanDbSuite)
+
 
 task compileGwt (dependsOn: classes, type: JavaExec) {