diff --git a/js-test/build.gradle b/js-test/build.gradle
index 359d2a5d1d3966733c412665bef466288c5434ce..42556a38a8ee213d5346c2f54ff54a35f855e9dd 100644
--- a/js-test/build.gradle
+++ b/js-test/build.gradle
@@ -34,13 +34,26 @@ configurations.create('externalDss')
 
 dependencies {
 
-    compile 'reflections:reflections:0.9.10',
+    api 'reflections:reflections:0.9.10',
     'testng:testng:6.8-CISD',
 	'fasterxml:jackson-core:2.9.10',
 	'fasterxml:jackson-annotations:2.9.10',
 	'fasterxml:jackson-databind:2.9.10.8'
 
-	testCompile project(path: ':ui-test', configuration: 'tests')
+    testImplementation project(path: ':commonbase', configuration: 'tests'),
+                       project(path: ':common', configuration: 'tests'),
+                       project(path: ':dbmigration', configuration: 'tests'),
+                       project(path: ':authentication', configuration: 'tests'),
+                       project(path: ':openbis_api', configuration: 'tests'),
+                       project(path: ':openbis-common', configuration: 'tests'),
+                       project(path: ':datastore_server', configuration: 'tests'),
+                       project(path: ':ui-test', configuration: 'tests'),
+                       'fjelmer:classycle:1.4.2',
+                       'testng:testng:6.8-CISD',
+                        'selenium:selenium-java:3.141.59'
+    testImplementation (project(path: ':openbis', configuration: 'tests')) {
+        exclude group: 'google', module: 'gwt-user'
+    }
 	
 	testRuntimeFirst 'javax:servlet-api:3.1.0', 'reflections:reflections:0.9.10', 'apache:commons-lang3:3.11'
 	
@@ -72,7 +85,7 @@ import org.gradle.internal.os.OperatingSystem
 
 test {
     useTestNG()
-    options.suites('source/java/tests-dev.xml')
+    options.suites('source/java/tests.xml')
 
     jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m', '-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StrErrLog', '-Duser.timezone=Europe/Zurich', '-Xdebug', '-Xrunjdwp:transport=dt_socket,address=20010,server=y,suspend=n'
     
diff --git a/ui-test/build.gradle b/ui-test/build.gradle
index 41c6d6232a6fce22eccafed1649cbd5acce2082a..502ac30269fdbd69f159f12ff6d8a2f2709fb6a9 100644
--- a/ui-test/build.gradle
+++ b/ui-test/build.gradle
@@ -31,8 +31,19 @@ configurations.create('testRuntimeSecond')
 configurations.create('externalDss')
 
 dependencies {
-	testImplementation project(':datastore_server'),
+    testImplementation project(path: ':commonbase', configuration: 'tests'),
+                       project(path: ':common', configuration: 'tests'),
+                       project(path: ':dbmigration', configuration: 'tests'),
+                       project(path: ':authentication', configuration: 'tests'),
+                       project(path: ':openbis_api', configuration: 'tests'),
+                       project(path: ':openbis-common', configuration: 'tests'),
+                       project(path: ':datastore_server', configuration: 'tests'),
+                       'fjelmer:classycle:1.4.2',
+                       'testng:testng:6.8-CISD',
                         'selenium:selenium-java:3.141.59'
+    testImplementation (project(path: ':openbis', configuration: 'tests')) {
+        exclude group: 'google', module: 'gwt-user'
+    }
 			
 	testRuntimeFirst 'javax:servlet-api:3.1.0', 'reflections:reflections:0.9.10', 'apache:commons-lang3:3.11'