diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e9d7c7ef5..cd399065c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,4 +33,4 @@ jobs:
         java-version: ${{ matrix.java }}
         cache: 'gradle'
     - name: Build with Gradle
-      run: ./gradlew clean build unitTest
+      run: ./gradlew clean build
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c52cbfca3..a3d59c308 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,8 +42,7 @@ jobs:
       jdkVersionOption: "$(JDK_VERSION)"
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
-      tasks: 'build'
-      options: 'uiAutomationTest -x test'
+      tasks: 'build uiAutomationTest'
 - job: iOS_E2E_Tests
 #  timeoutInMinutes: '90'
   steps:
@@ -62,5 +61,4 @@ jobs:
       jdkVersionOption: "$(JDK_VERSION)"
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
-      tasks: 'build'
-      options: 'xcuiTest -x test'
+      tasks: 'build xcuiTest'
diff --git a/build.gradle b/build.gradle
index 098ebe28f..f5decafd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -200,7 +200,7 @@ processResources {
     ]
 }
 
-task unitTest( type: Test ) {
+test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     testLogging.exceptionFormat = 'full'
@@ -212,6 +212,7 @@ task unitTest( type: Test ) {
         includeTestsMatching 'io.appium.java_client.remote.*'
         includeTestsMatching 'io.appium.java_client.touch.*'
     }
+    finalizedBy jacocoTestReport
 }
 
 task xcuiTest( type: Test ) {
diff --git a/jitpack.yml b/jitpack.yml
index e594bc18b..f5edf063b 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +1,4 @@
 jdk:
   - openjdk8
 install:
-   - ./gradlew clean build publishToMavenLocal -x signMavenJavaPublication -x test
+   - ./gradlew clean build publishToMavenLocal -x signMavenJavaPublication