diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9b0e384d92..8e167bd32c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -4,15 +4,20 @@ on: [push, pull_request]
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
-
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [8, 11, 15]
+        os: [ubuntu-latest, macOS-latest]
+      fail-fast: false
+      max-parallel: 3
+    name: Build and Test JDK ${{ matrix.java }}, ${{ matrix.os }}
     steps:
-    
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: ${{ matrix.java }}
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository