diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e4fb43..3673a5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,20 +15,36 @@ jobs:
         include:
           - toolset: gcc-5
             cxxstd: "03,11,14,1z"
+            os: ubuntu-16.04
           - toolset: gcc-6
             cxxstd: "03,11,14,1z"
+            os: ubuntu-18.04
           - toolset: gcc-7
             cxxstd: "03,11,14,17"
+            os: ubuntu-18.04
           - toolset: gcc-8
             cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
           - toolset: gcc-9
             cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
           - toolset: gcc-10
             cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
           - toolset: clang
             cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
+          - toolset: clang
+            cxxstd: "03,11,14,17,2a"
+            os: macos-10.15
+          - toolset: msvc-14.1
+            cxxstd: "14,17,latest"
+            os: windows-2016
+          - toolset: msvc-14.2
+            cxxstd: "14,17,latest"
+            os: windows-2019
 
-    runs-on: ubuntu-latest
+    runs-on: ${{matrix.os}}
 
     steps:
       - uses: actions/checkout@v2