diff --git a/admin-tools/run-pyenvlib-test-all.sh b/admin-tools/run-pyenvlib-test-all.sh
new file mode 100755
index 00000000..037c3643
--- /dev/null
+++ b/admin-tools/run-pyenvlib-test-all.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Runs test_pyenvlib.test on all versions of Python master.
+function finish {
+  cd $owd
+}
+
+# FIXME put some of the below in a common routine
+owd=$(pwd)
+trap finish EXIT
+
+cd $(dirname ${BASH_SOURCE[0]})
+if ! source ./pyenv-newer-versions ; then
+    exit $?
+fi
+if ! source ./setup-master.sh ; then
+    exit $?
+fi
+cd ../test
+for version in $PYVERSIONS; do
+    if ! pyenv local $version ; then
+	exit $?
+    fi
+    echo "====== Running test_pyenvlib.py on $version ====="
+    if ! python ./test_pyenvlib.py --weak-verify --max 800 --${version} ; then
+	exit $?
+    fi
+    echo "------ Done test_pyenvlib.py on $version -----"
+done
diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index 6300f0f9..31b28d83 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.6.3
+PYTHON_VERSION=3.6.4
 
 # FIXME put some of the below in a common routine
 function finish {