diff --git a/.github/workflows/build_wheels_and_publish.yml b/.github/workflows/build_wheels_and_publish.yml
index 62d184c1c5..d320bcbe16 100644
--- a/.github/workflows/build_wheels_and_publish.yml
+++ b/.github/workflows/build_wheels_and_publish.yml
@@ -26,6 +26,8 @@ jobs:
     - name: Build manylinux Python wheels
       if: matrix.os == 'ubuntu-latest'
       uses: './build_manylinux_wheels'
+      with:
+        python-versions: "cp36-cp36m cp37-cp37m cp38-cp38"
 
     - name: Install standard python dependencies
       if: matrix.os != 'ubuntu-latest'
@@ -35,6 +37,10 @@ jobs:
     - name: Install build-time deps for MacOS
       if: matrix.os == 'macos-latest'
       run: |
+        # Temporary fix for https://github.com/actions/virtual-environments/issues/1811
+        brew untap local/homebrew-openssl
+        brew untap local/homebrew-python2
+        # End of fix
         brew update
         brew install graphviz
         brew install sundials
diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
index 6997fda137..21ee6c3bf5 100644
--- a/.github/workflows/test_on_push.yml
+++ b/.github/workflows/test_on_push.yml
@@ -50,6 +50,10 @@ jobs:
     - name: Install MacOS system dependencies
       if: matrix.os == 'macos-latest'
       run: |
+        # Temporary fix for https://github.com/actions/virtual-environments/issues/1811
+        brew untap local/homebrew-openssl
+        brew untap local/homebrew-python2
+        # End of fix
         brew update
         brew install graphviz
         brew install openblas
diff --git a/build_manylinux_wheels/entrypoint.sh b/build_manylinux_wheels/entrypoint.sh
index 77c19ade58..203e5471d3 100644
--- a/build_manylinux_wheels/entrypoint.sh
+++ b/build_manylinux_wheels/entrypoint.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e -x
 
+# GitHub runners add "-e LD_LIBRARY_PATH" option to "docker run",
+# overriding default value of LD_LIBRARY_PATH in manylinux image. This
+# causes libcrypt.so.2 to be missing (it lives in /usr/local/lib)
+export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+
 # CLI arguments
 PY_VERSIONS=$1
 
diff --git a/run-tests.py b/run-tests.py
index 728d0f8a13..3e17920076 100755
--- a/run-tests.py
+++ b/run-tests.py
@@ -31,6 +31,10 @@ def run_code_tests(executable=False, folder: str = "unit", interpreter="python")
         tests = "tests/" + folder
         if folder == "unit":
             pybamm.settings.debug_mode = True
+    if interpreter == "python":
+        # Make sure to refer to the interpreter for the
+        # currently activated virtual environment
+        interpreter = sys.executable
     if executable is False:
         suite = unittest.defaultTestLoader.discover(tests, pattern="test*.py")
         unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/setup.py b/setup.py
index f5cc247aa7..f9a7a09c60 100644
--- a/setup.py
+++ b/setup.py
@@ -172,7 +172,7 @@ def compile_KLU():
 
 setup(
     name="pybamm",
-    version=load_version() + ".post2",
+    version=load_version() + ".post3",
     description="Python Battery Mathematical Modelling.",
     long_description=readme,
     long_description_content_type="text/markdown",