diff --git a/build.gradle b/build.gradle
index dc3bf215ec88f..0652a66df745e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -602,7 +602,9 @@ subprojects {
     finalizedBy("copyTestXml")
   }
 
-  task integrationTest(type: Test, dependsOn: compileJava) {
+  tasks.register('integrationTest', Test) {
+    dependsOn(tasks.compileJava)
+
     maxParallelForks = maxTestForks
     ignoreFailures = userIgnoreFailures
 
@@ -634,7 +636,9 @@ subprojects {
     }
   }
 
-  task unitTest(type: Test, dependsOn: compileJava) {
+  tasks.register('unitTest', Test)  {
+    dependsOn(tasks.compileJava)
+
     maxParallelForks = maxTestForks
     ignoreFailures = userIgnoreFailures
 
@@ -664,6 +668,17 @@ subprojects {
     }
   }
 
+  testing {
+    suites {
+        test {
+            targets {
+                integrationTest
+                unitTest
+            }
+        }
+    }
+  }
+
   // remove test output from all test types
   tasks.withType(Test).all { t ->
     cleanTest {