diff --git a/.github/workflows/macos_tests.yml b/.github/workflows/macos_tests.yml
new file mode 100644
index 00000000..060af251
--- /dev/null
+++ b/.github/workflows/macos_tests.yml
@@ -0,0 +1,41 @@
+name: macos_tests
+on: [pull_request, push]
+jobs:
+  macos_tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - 2.7.18
+          - 3.5.10
+          - 3.6.15
+          - 3.7.10
+          - 3.8.10
+          - 3.9.5
+          - 3.10.0
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+      # Normally, we would use the superbly maintained...
+      # - uses: actions/setup-python@v2
+      #   with:
+      #    python-version: ${{ matrix.python-version }}
+      # ... but in the repo, we want to test pyenv builds on macOS
+      - run: |
+          brew install openssl readline sqlite3 xz zlib
+      # https://github.com/pyenv/pyenv#installation
+      - run: pwd
+      - env:
+          PYENV_ROOT: /Users/runner/work/pyenv/pyenv
+        run: |
+          echo $PYENV_ROOT
+          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
+          bin/pyenv install ${{ matrix.python-version }}
+          bin/pyenv global ${{ matrix.python-version }}
+          bin/pyenv rehash
+      - run: python --version
+      - run: python -m pip --version
+      - shell: python  # Prove that actual Python == expected Python
+        env:
+          EXPECTED_PYTHON: ${{ matrix.python-version }}
+        run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
diff --git a/.github/workflows/ubuntu_tests.yml b/.github/workflows/ubuntu_tests.yml
index 81bab713..3c6572f4 100644
--- a/.github/workflows/ubuntu_tests.yml
+++ b/.github/workflows/ubuntu_tests.yml
@@ -8,7 +8,7 @@ jobs:
         python-version:
           - 2.7.18
           - 3.5.10
-          - 3.6.13
+          - 3.6.15
           - 3.7.10
           - 3.8.10
           - 3.9.5
diff --git a/plugins/python-build/share/python-build/3.6.15 b/plugins/python-build/share/python-build/3.6.15
index 7a9526bb..a305fbd2 100644
--- a/plugins/python-build/share/python-build/3.6.15
+++ b/plugins/python-build/share/python-build/3.6.15
@@ -1,6 +1,5 @@
 #require_gcc
 prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then