diff --git a/cliff/argparse.py b/cliff/argparse.py
index 48468c48..58e26f02 100644
--- a/cliff/argparse.py
+++ b/cliff/argparse.py
@@ -6,7 +6,7 @@ import sys
 
 
 if sys.version_info < (3, 5):
-    class ArgumentParser(ArgumentParser):
+    class ArgumentParser(ArgumentParser):  # noqa
         def __init__(self, *args, **kwargs):
             self.allow_abbrev = kwargs.pop("allow_abbrev", True)
             super(ArgumentParser, self).__init__(*args, **kwargs)
diff --git a/cliff/tests/test_interactive.py b/cliff/tests/test_interactive.py
index 20306d15..424e93cf 100644
--- a/cliff/tests/test_interactive.py
+++ b/cliff/tests/test_interactive.py
@@ -32,8 +32,8 @@ def test_no_completenames():
 
 
 def test_both_completenames():
-    # cmd2.Cmd define do_hi and do_history methods
-    _test_completenames(['hi', 'history', 'hips', 'hippo'], 'hi')
+    # cmd2.Cmd defines do_history method
+    _test_completenames(['history', 'hips', 'hippo'], 'hi')
 
 
 def _test_completedefault(expecteds, line, begidx):