diff --git a/admin-tools/pyenv-newer-versions b/admin-tools/pyenv-newer-versions
index c08a3ab8..229fb7b4 100644
--- a/admin-tools/pyenv-newer-versions
+++ b/admin-tools/pyenv-newer-versions
@@ -1,4 +1,6 @@
 # -*- shell-script -*-
+# Sets PYVERSIONS to be pyenv versions that
+# we can use in the master branch.
 if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
diff --git a/admin-tools/pyenv-older-versions b/admin-tools/pyenv-older-versions
index 63e4e202..f2e792cb 100644
--- a/admin-tools/pyenv-older-versions
+++ b/admin-tools/pyenv-older-versions
@@ -1,4 +1,7 @@
 # -*- shell-script -*-
+# Sets PYVERSIONS to be pyenv versions that
+# we can use in the python-2.4 branch.
+
 if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
diff --git a/admin-tools/pyenv-oldest-versions b/admin-tools/pyenv-oldest-versions
new file mode 100644
index 00000000..254fcf85
--- /dev/null
+++ b/admin-tools/pyenv-oldest-versions
@@ -0,0 +1,9 @@
+# -*- shell-script -*-
+# Sets PYVERSIONS to be all pyenv the oldest versions we have.
+# These are not covered (yet) by uncompyle6, although
+# some programs do work here.
+if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
+    echo "This script should be *sourced* rather than run directly through bash"
+    exit 1
+fi
+export PYVERSIONS='2.1.3 2.2.3 2.3.7'
diff --git a/test/bytecode_2.1/10_del.pyc b/test/bytecode_2.1/10_del.pyc
new file mode 100644
index 00000000..41a3f854
Binary files /dev/null and b/test/bytecode_2.1/10_del.pyc differ
diff --git a/test/bytecode_3.2/01_delete_deref.pyc b/test/bytecode_3.2/01_delete_deref.pyc
deleted file mode 100644
index 15184309..00000000
Binary files a/test/bytecode_3.2/01_delete_deref.pyc and /dev/null differ
diff --git a/test/bytecode_3.3/01_delete_deref.pyc b/test/bytecode_3.3/01_delete_deref.pyc
deleted file mode 100644
index 06a987bb..00000000
Binary files a/test/bytecode_3.3/01_delete_deref.pyc and /dev/null differ
diff --git a/test/bytecode_3.3/10_del.pyc b/test/bytecode_3.3/10_del.pyc
index 885ba319..d083e9b1 100644
Binary files a/test/bytecode_3.3/10_del.pyc and b/test/bytecode_3.3/10_del.pyc differ
diff --git a/test/bytecode_3.4/01_delete_deref.pyc b/test/bytecode_3.4/01_delete_deref.pyc
deleted file mode 100644
index 176286a7..00000000
Binary files a/test/bytecode_3.4/01_delete_deref.pyc and /dev/null differ
diff --git a/test/bytecode_3.4/10_del.pyc b/test/bytecode_3.4/10_del.pyc
index 1aa477c0..269d2be3 100644
Binary files a/test/bytecode_3.4/10_del.pyc and b/test/bytecode_3.4/10_del.pyc differ
diff --git a/test/bytecode_3.5/10_del.pyc b/test/bytecode_3.5/10_del.pyc
index 4bf9719f..3a448bae 100644
Binary files a/test/bytecode_3.5/10_del.pyc and b/test/bytecode_3.5/10_del.pyc differ
diff --git a/test/bytecode_3.6/10_del.pyc b/test/bytecode_3.6/10_del.pyc
new file mode 100644
index 00000000..50903263
Binary files /dev/null and b/test/bytecode_3.6/10_del.pyc differ
diff --git a/test/simple_source/stmts/10_del.py b/test/simple_source/stmts/10_del.py
index 65d1aa3a..43576bcb 100644
--- a/test/simple_source/stmts/10_del.py
+++ b/test/simple_source/stmts/10_del.py
@@ -1,6 +1,9 @@
+# Ensures opcodes DELETE_SUBSCR and DELETE_GLOBAL are covered
 a = (1, 2, 3)
+# DELETE_NAME
 del a
 
+# DELETE_SUBSCR
 b = [4, 5, 6]
 del b[1]
 del b[:]
@@ -14,5 +17,14 @@ del d[1:3:2]
 
 e = ('a', 'b')
 def foo():
+    # covers DELETE_GLOBAL
     global e
     del e
+
+def a():
+    del z
+    def b(y):
+        # covers DELETE_FAST
+        del y
+        # LOAD_DEREF
+        return z