diff --git a/__pkginfo__.py b/__pkginfo__.py
index a2d83fdb..d3d566f7 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -39,7 +39,7 @@ entry_points       = {
         'pydisassemble=uncompyle6.bin.pydisassemble:main',
     ]}
 ftp_url            = None
-install_requires   = ['spark-parser >= 1.7.1, < 1.8.0',
+install_requires   = ['spark-parser >= 1.8.0, < 1.9.0',
                       'xdis >= 3.6.1, < 3.7.0', 'six']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
index a2299cca..51919b36 100644
--- a/pytest/test_grammar.py
+++ b/pytest/test_grammar.py
@@ -14,7 +14,8 @@ def test_grammar():
             "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dump_grammar())
 
     p = get_python_parser(PYTHON_VERSION, is_pypy=IS_PYPY)
-    lhs, rhs, tokens, right_recursive = p.check_sets()
+    (lhs, rhs, tokens,
+     right_recursive, dup_rhs) = p.check_sets()
     expect_lhs = set(['expr1024', 'pos_arg'])
     unused_rhs = set(['build_list', 'call_function', 'mkfunc',
                       'mklambda',