diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index becf02b0..f4931554 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -14,7 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest']
+        os:
+        - 'macos-latest'
+        - 'ubuntu-latest'
         version:
         - 8
         - 9
@@ -34,18 +36,43 @@ jobs:
         - temurin
         - zulu
         - liberica
-        - microsoft
         - corretto
         - semeru
-        - oracle
         - dragonwell
         include:
-        - os: windows-latest
+        - os: ubuntu-latest
           version: 21
-          distribution: temurin
-        - os: macos-latest
+          distribution: microsoft
+        - os: ubuntu-latest
+          version: 17
+          distribution: microsoft
+        - os: ubuntu-latest
+          version: 16
+          distribution: microsoft
+        - os: ubuntu-latest
+          version: 11
+          distribution: microsoft
+        - os: ubuntu-latest
           version: 21
-          distribution: temurin
+          distribution: oracle
+        - os: ubuntu-latest
+          version: 20
+          distribution: oracle
+        - os: ubuntu-latest
+          version: 19
+          distribution: oracle
+        - os: ubuntu-latest
+          version: 18
+          distribution: oracle
+        - os: ubuntu-latest
+          version: 17
+          distribution: oracle
+        # - os: windows-latest
+        #   version: 21
+        #   distribution: temurin
+        # - os: macos-latest
+        #   version: 21
+        #   distribution: temurin
 
     runs-on: ${{ matrix.os }}
 
diff --git a/java/Makefile b/java/Makefile
index 7f88138d..396b2d21 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -21,7 +21,8 @@ target/jacoco.exec: ../LICENSE
 test: target/jacoco.exec
 	@$(MVN) $(MVN_FLAGS) test -Dtest.single
 
-test_auto: test_1C
+test_auto: target/jacoco.exec
+	@$(MVN) $(MVN_FLAGS) test -T 1C
 
 .PHONY: test_%
 test_%: target/jacoco.exec