diff --git a/admin-tools/pyenv-newer-versions b/admin-tools/pyenv-newer-versions
index f3de843f..07904153 100644
--- a/admin-tools/pyenv-newer-versions
+++ b/admin-tools/pyenv-newer-versions
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.5.5 3.6.4 2.6.9 3.3.7 2.7.14 3.2.6 3.1.5 3.4.8'
+export PYVERSIONS='3.5.5 3.6.5 2.6.9 3.3.7 2.7.14 3.2.6 3.1.5 3.4.8'
diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
index fe9e1c6d..6179e9b1 100644
--- a/pytest/test_grammar.py
+++ b/pytest/test_grammar.py
@@ -26,12 +26,13 @@ def test_grammar():
     expect_right_recursive = set([('designList',
                                    ('store', 'DUP_TOP', 'designList'))])
 
+    if PYTHON_VERSION != 3.7:
+        unused_rhs.add('call')
+
     if PYTHON_VERSION > 2.6:
         expect_lhs.add('kvlist')
         expect_lhs.add('kv3')
         unused_rhs.add('dict')
-    elif PYTHON_VERSION == 2.6:
-        unused_rhs.add('call')
 
     if PYTHON3:
         expect_lhs.add('load_genexpr')
@@ -43,8 +44,6 @@ def test_grammar():
             expect_lhs.add("annotate_arg")
             expect_lhs.add("annotate_tuple")
             unused_rhs.add("mkfunc_annotate")
-            if PYTHON_VERSION < 3.7:
-                unused_rhs.add('call')
             unused_rhs.add("dict_comp")
             unused_rhs.add("classdefdeco1")
             if PYTHON_VERSION != 3.6:
@@ -61,7 +60,6 @@ def test_grammar():
         pass
     else:
         expect_lhs.add('kwarg')
-        # unused_rhs.add('call')
 
     assert expect_lhs == set(lhs)
     assert unused_rhs == set(rhs)