Index: /trunk/.github/workflows/ant.yml
===================================================================
--- /trunk/.github/workflows/ant.yml	(revision 17690)
+++ /trunk/.github/workflows/ant.yml	(revision 17691)
@@ -75,5 +75,4 @@
         java: [8, 11, 16, 17-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
-        headless: ["true", "false"]
         exclude:
           - java: 8
@@ -81,9 +80,5 @@
           - java: 11
             os: macos-latest
-          - headless: "false"
-            os: macos-latest
-          - headless: "false"
-            os: windows-latest
-    name: Java ${{ matrix.java }} on ${{ matrix.os }} with headless=${{ matrix.headless }}
+    name: Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -143,6 +138,5 @@
 
       - name: Upload jar
-        # Only run on matrix.headless to avoid double jars. They should be the same jars.
-        if: ${{ always() && matrix.headless == 'true' }}
+        if: ${{ always() }}
         id: upload-jar
         env:
@@ -155,13 +149,9 @@
           asset_content_type: application/java-archive
 
-      - name: Test with Ant, headless ${{ matrix.headless }}
+      - name: Test with Ant
         if: ${{ needs.createrelease.outputs.josm_prerelease }}
         run: |
           ANT="${{ env.ANT_HOME }}/bin/ant -DnoJavaFX=true test-unit-hardfail"
-          if [ "${{ matrix.headless }}" == "true" ]; then
-            $ANT -Dtest.headless=true
-          else
-            xvfb-run $ANT -Dtest.headless=false
-          fi
+          $ANT -Dtest.headless=true
 
       - name: Dump errors if failed
@@ -173,5 +163,5 @@
         uses: actions/upload-artifact@v2
         with:
-          name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }} with headless=${{ matrix.headless }}
+          name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }}
           path: test/report/*.txt