diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml
index 73f0030f..aded155e 100644
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@@ -19,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        distribution: ['semeru'] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '16', '17']
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft', 'semeru'] # internally 'adopt-hotspot' is the same as 'adopt'
+        version: ['8', '11', '16']
         exclude:
         - distribution: microsoft
           version: 8
@@ -139,7 +139,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica']
+        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
         java-package: ['jre']
         version: ['16.0']
         include:
@@ -203,4 +203,4 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
-  # Only Microsoft provides AArch64. However, GitHub-hosted runners do not support this architecture.
+  # Only Microsoft and Semeru provide AArch64. However, GitHub-hosted runners do not support this architecture.