diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index d52ab1fc0f5c6f9df0c3a68359d63adc52a0a304..8ed952349cd2d1982ec7b320cde7adf421612837 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -34,12 +34,13 @@ repositories {
 }
 
 test {
-	useTestNG()
-		options { suites(file('sourceTest/java/tests.xml')) }
-
-		jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
-		
-		testLogging.showStandardStreams = true
+	useTestNG {
+		suites = ['sourceTest/java/tests.xml']
+	}
+	
+	jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
+	
+	testLogging.showStandardStreams = true
 }
 
 task sourceJar(type: Jar) {
diff --git a/openbis/build.gradle b/openbis/build.gradle
index a38e6e9d97dbf8da581b0f320269b00bd30a4413..92e25de22884d856c0a5c521eb207ebfb1ee74f4 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -116,3 +116,9 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
 test.dependsOn(copyTestData)
 
 
+test {
+	useTestNG {
+		suites.add('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+	}
+}
+