diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a27de4ec65..a8611f82b4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,17 +9,12 @@ jobs:
     steps:
       - name: Checkout current develop branch
         uses: actions/checkout@v1
-      - name: Setup JDK 1.8
+      - name: Setup JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Run unit tests and coverage generation
         run: ./gradlew jacocoTestReport
-      - name: SonarCloud static code analysis
-        run: ./gradlew sonar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -29,4 +24,9 @@ jobs:
           avd-name: test
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim
           disable-animations: true
-          script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest connectedPlayDebugAndroidTest connectedFossDebugAndroidTest
\ No newline at end of file
+          script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest connectedPlayDebugAndroidTest connectedFossDebugAndroidTest
+      - name: SonarCloud static code analysis
+        run: ./gradlew sonar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
\ No newline at end of file
diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
index 6dad3b2b72..935687d9ea 100644
--- a/omniNotes/build.gradle
+++ b/omniNotes/build.gradle
@@ -75,7 +75,7 @@ android {
 
     buildTypes {
         debug {
-            testCoverageEnabled false
+            testCoverageEnabled true
         }
         release {
             minifyEnabled true
@@ -255,7 +255,7 @@ jacocoAndroidUnitTestReport {
     xml.enabled true
 }
 jacoco {
-    toolVersion = "0.8.4"
+    toolVersion = "0.8.5"
 }
 
 tasks.withType(Test) {