diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
index fbb6aa2f..feb485c5 100644
--- a/pytest/test_grammar.py
+++ b/pytest/test_grammar.py
@@ -53,35 +53,7 @@ def test_grammar():
             # NOTE: this may disappear
             expect_lhs.add("except_handler_else")
 
-    expect_lhs.add("load_genexpr")
-
-    unused_rhs = unused_rhs.union(
-        set(
-            """
-    except_pop_except generator_exp
-    """.split()
-        )
-    )
-    if PYTHON_VERSION_TRIPLE < (3, 7):
-        expect_lhs.add("annotate_arg")
-        expect_lhs.add("annotate_tuple")
-        unused_rhs.add("mkfunc_annotate")
-
-    unused_rhs.add("dict_comp")
-    unused_rhs.add("classdefdeco1")
-    unused_rhs.add("tryelsestmtl")
-    if PYTHON_VERSION_TRIPLE >= (3, 5):
-        expect_right_recursive.add(
-            (("l_stmts", ("lastl_stmt", "come_froms", "l_stmts")))
-        )
-        pass
-    pass
-
-    # FIXME
-    if PYTHON_VERSION_TRIPLE < (3, 8):
-        assert expect_lhs == set(lhs)
-        assert unused_rhs == set(rhs)
-
+    expect_lhs.add("kwarg")
     assert expect_right_recursive == right_recursive
 
     expect_dup_rhs = frozenset(
diff --git a/pytest/test_pysource.py-notyet b/pytest/test_pysource.py-notyet
index dff5915a..0b9734b8 100644
--- a/pytest/test_pysource.py-notyet
+++ b/pytest/test_pysource.py-notyet
@@ -5,7 +5,6 @@ from uncompyle6.semantics.consts import (
     # RETURN_NONE, PASS, RETURN_LOCALS
 )
 
-from xdis.version_info import PYTHON3
 from StringIO import StringIO
 
 from uncompyle6.semantics.pysource import (SourceWalker, deparse_code2str)
diff --git a/test-unit/test_grammar.py b/test-unit/test_grammar.py
index 57f92989..683d0bcc 100644
--- a/test-unit/test_grammar.py
+++ b/test-unit/test_grammar.py
@@ -1,7 +1,7 @@
 import re
 import unittest
-from uncompyle6 import PYTHON_VERSION, IS_PYPY # , PYTHON_VERSION
 from uncompyle6.parser import get_python_parser, python_parser
+from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY
 
 class TestGrammar(unittest.TestCase):
     def test_grammar(self):
@@ -14,7 +14,7 @@ class TestGrammar(unittest.TestCase):
             self.assertEqual(remain_tokens, set([]),
                     "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dump_grammar()))
 
-        p = get_python_parser(PYTHON_VERSION, is_pypy=IS_PYPY)
+        p = get_python_parser(PYTHON_VERSION_TRIPLE, is_pypy=IS_PYPY)
         (lhs, rhs, tokens,
          right_recursive, dup_rhs) = p.check_sets()
         expect_lhs = set(['pos_arg', 'get_iter', 'attribute'])
@@ -47,7 +47,7 @@ class TestGrammar(unittest.TestCase):
     # FIXME: Something got borked here
     def no_test_dup_rule(self):
         import inspect
-        python_parser(PYTHON_VERSION, inspect.currentframe().f_code,
+        python_parser(PYTHON_VERSION_TRIPLE, inspect.currentframe().f_code,
                       is_pypy=IS_PYPY,
                       parser_debug={
                           'dups': True, 'transition': False, 'reduce': False,
diff --git a/test/test_pyenvlib.py b/test/test_pyenvlib.py
index cd1e315b..3f1ef4f3 100755
--- a/test/test_pyenvlib.py
+++ b/test/test_pyenvlib.py
@@ -20,7 +20,6 @@ Step 2: Run the test:
 	  test_pyenvlib --mylib --verify # decompile verify 'mylib'
 """
 
-from uncompyle6 import main, PYTHON3
 import os, time, re, shutil, sys
 from fnmatch import fnmatch
 
@@ -81,9 +80,6 @@ for vers in TEST_VERSIONS:
     else:
         if vers == "native":
             short_vers = os.path.basename(sys.path[-1])
-            from xdis import PYTHON_VERSION
-            if PYTHON_VERSION > 3.0:
-                PYC = "*.cpython-%d.pyc" % int(PYTHON_VERSION * 10)
             test_options[vers] = (sys.path[-1], PYC, short_vers)
         else:
             short_vers = vers[:3]