diff --git a/admin-tools/pyenv-all-versions b/admin-tools/pyenv-all-versions
new file mode 100644
index 00000000..6135a635
--- /dev/null
+++ b/admin-tools/pyenv-all-versions
@@ -0,0 +1,19 @@
+# -*- shell-script -*-
+# Sets PYVERSIONS to be all pyenv versions we have
+if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
+    echo "This script should be *sourced* rather than run directly through bash"
+    exit 1
+fi
+
+olddir=$(pwd)
+mydir=$(dirname ${BASH_SOURCE[0]})
+cd $mydir
+
+all=""
+for file in pyenv-{olde{st,r},newer}-versions ; do
+    . $mydir/$file
+    all="$all $PYVERSIONS"
+done
+
+PYVERSIONS="$all"
+cd $olddir
diff --git a/test/Makefile b/test/Makefile
index a7edd1f9..907bdac0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -124,6 +124,12 @@ grammar-coverage-2.7:
 	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-27.cover $(PYTHON) test_pythonlib.py --bytecode-2.7
 	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-27.cover $(PYTHON) test_pyenvlib.py --2.7.13
 
+#: Get grammar coverage for Python 3.0
+grammar-coverage-3.0:
+	-rm $(COVER_DIR)/spark-grammar-32.cover
+	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-30.cover $(PYTHON) test_pythonlib.py --bytecode-3.1
+	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-30.cover $(PYTHON) test_pyenvlib.py --3.0.1
+
 #: Get grammar coverage for Python 3.1
 grammar-coverage-3.1:
 	-rm $(COVER_DIR)/spark-grammar-32.cover
diff --git a/test/bytecode_3.0/01_ops.pyc b/test/bytecode_3.0/01_ops.pyc
new file mode 100644
index 00000000..6988377b
Binary files /dev/null and b/test/bytecode_3.0/01_ops.pyc differ
diff --git a/test/bytecode_3.1/01_ops.pyc b/test/bytecode_3.1/01_ops.pyc
new file mode 100644
index 00000000..12d44468
Binary files /dev/null and b/test/bytecode_3.1/01_ops.pyc differ