diff --git a/shared/cppJavaDesktopTestTask.gradle b/shared/cppJavaDesktopTestTask.gradle
new file mode 100644
index 00000000000..475c38c4cd3
--- /dev/null
+++ b/shared/cppJavaDesktopTestTask.gradle
@@ -0,0 +1,7 @@
+apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+
+tasks.register('testDesktop') {
+    dependsOn testDesktopJava
+    dependsOn testDesktopCpp
+}
diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle
index f2d88c4a829..1f3ff10acc1 100644
--- a/shared/javacpp/setupBuild.gradle
+++ b/shared/javacpp/setupBuild.gradle
@@ -182,8 +182,7 @@ model {
     }
 }
 
-apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
-apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/cppJavaDesktopTestTask.gradle"
 
 tasks.withType(RunTestExecutable) {
     args "--gtest_output=xml:test_detail.xml"
diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
index 6f4345ad57f..9f9334ffc02 100644
--- a/shared/jni/setupBuild.gradle
+++ b/shared/jni/setupBuild.gradle
@@ -327,8 +327,7 @@ model {
     }
 }
 
-apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
-apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/cppJavaDesktopTestTask.gradle"
 
 ext.getJniSpecClass = {
     return JniNativeLibrarySpec