diff --git a/.github/workflows/java-all.yml b/.github/workflows/java-all.yml
deleted file mode 100644
index 34cdb8b46..000000000
--- a/.github/workflows/java-all.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Java/MacOSX
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: [self-hosted, macOS, x64]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.5.4    
-    - name: Build tool with Maven
-      run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-    - name: Test with Maven
-      run: .github/scripts/run-tests-java.sh
-      env: 
-        TARGET: swift
-        GROUP: ALL
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 5bae5b723..cbce1a2ee 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -12,10 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
- #       GROUP: [LEXER, PARSER, RECURSION]
- #       TARGET: [swift, cpp, dotnet]
-        GROUP: [LEXER]
-        TARGET: [dotnet]
+        GROUP: [LEXER, PARSER, RECURSION]
+        TARGET: [swift, cpp, dotnet]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 1.8