diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2a8964f29..b44191037 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,15 +1,13 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - develop
-  pull_request:
-    branches: develop
-
+on: [push, pull_request]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.15.x, 1.16.x]
+        os: [ubuntu-latest, macos-latest, windows-latest, freebsd-latest, openbsd-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2