diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 558a97c23..c52cbfca3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -64,15 +64,3 @@ jobs:
       publishJUnitResults: true
       tasks: 'build'
       options: 'xcuiTest -x test'
-- job: Misc_Tests
-  steps:
-    - task: Gradle@2
-      inputs:
-        gradleWrapperFile: 'gradlew'
-        gradleOptions: '-Xmx3072m'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: "$(JDK_VERSION)"
-        jdkArchitectureOption: 'x64'
-        publishJUnitResults: true
-        tasks: 'build'
-        options: 'miscTest -x test -x signMavenJavaPublication'
diff --git a/build.gradle b/build.gradle
index c4bff9b07..7e9991551 100644
--- a/build.gradle
+++ b/build.gradle
@@ -205,8 +205,12 @@ task unitTest( type: Test ) {
     testLogging.showStandardStreams = true
     testLogging.exceptionFormat = 'full'
     filter {
+        includeTestsMatching 'io.appium.java_client.drivers.options.*'
+        includeTestsMatching 'io.appium.java_client.events.*'
         includeTestsMatching 'io.appium.java_client.internal.*'
         includeTestsMatching 'io.appium.java_client.proxy.*'
+        includeTestsMatching 'io.appium.java_client.remote.*'
+        includeTestsMatching 'io.appium.java_client.touch.*'
     }
 }
 
@@ -241,15 +245,3 @@ task uiAutomationTest( type: Test ) {
         includeTestsMatching 'io.appium.java_client.service.local.ThreadSafetyTest'
     }
 }
-
-task miscTest( type: Test ) {
-    useJUnitPlatform()
-    testLogging.showStandardStreams = true
-    testLogging.exceptionFormat = 'full'
-    filter {
-        includeTestsMatching 'io.appium.java_client.touch.*'
-        includeTestsMatching 'io.appium.java_client.events.*'
-        includeTestsMatching 'io.appium.java_client.remote.*'
-        includeTestsMatching 'io.appium.java_client.drivers.options.*'
-    }
-}