diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
new file mode 100644
index 00000000..19928d87
--- /dev/null
+++ b/.github/workflows/test-osx.yml
@@ -0,0 +1,45 @@
+name: Test OSX
+
+on:  [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.6]
+        cxx: [clang++]
+        std: [c++98, c++11, c++14] # TODO: c++17 is failing !
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: setup prerequisites
+      run: |
+        brew install boost
+        python -m pip install --upgrade pip
+        python -m pip install setuptools faber
+    - name: build
+      run: |
+        python --version
+        ${{ matrix.cxx }} --version
+        faber -v
+        sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber
+        faber \
+          --builddir=build \
+          cxx.name=${{ matrix.cxx }} \
+          cxxflags=-std=${{ matrix.std }} \
+          -j`sysctl -n hw.ncpu`
+    - name: test
+      run: |
+        faber \
+          --builddir=build\
+          cxx.name=${{ matrix.cxx }} \
+          cxxflags=-std=${{ matrix.std }} \
+          -j`sysctl -n hw.ncpu` \
+          test.report
diff --git a/.github/workflows/build_test_docker.yml b/.github/workflows/test-ubuntu.yml
similarity index 66%
rename from .github/workflows/build_test_docker.yml
rename to .github/workflows/test-ubuntu.yml
index 23550cfa..61a29598 100644
--- a/.github/workflows/build_test_docker.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -1,19 +1,17 @@
-name: Build and Test - Linux Docker
+name: Test Ubuntu
 
-on:  [ push, pull_request ]
+on:  [push, pull_request]
 
 jobs:
   build:
-
-    # ubuntu-latest will be shortly upgrading to this
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        python: [ python, python3 ]
-        cxx: [ g++, clang++ ]
-        std: [ c++98, c++11]
+        python: [python, python3]
+        cxx: [g++, clang++]
+        std: [c++98, c++11, c++14, c++17]
         include:
           # Add the appropriate docker image for each compiler.
           # The images from teeks99/boost-python-test already have boost::python
@@ -30,18 +28,24 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Test
+    - name: build
       run: |
         ${{ matrix.python }} --version
         ${{ matrix.cxx }} --version
         faber -v
-        ls -l ${BOOST_PY_DEPS}
-
         sed -e "s/\$PYTHON/${{ matrix.python }}/g" .ci/faber > ~/.faber
-        
         faber \
           --with-boost-include=${BOOST_PY_DEPS} \
-          --builddir=build test.report \
+          --builddir=build \
           cxx.name=${{ matrix.cxx }} \
           cxxflags=-std=${{ matrix.std }} \
           -j`nproc`
+    - name: test
+      run: |
+        faber \
+          --with-boost-include=${BOOST_PY_DEPS} \
+          --builddir=build \
+          cxx.name=${{ matrix.cxx }} \
+          cxxflags=-std=${{ matrix.std }} \
+          -j`nproc` \
+          test.report