diff --git a/cliff/app.py b/cliff/app.py
index 95a8b341..15747fe5 100644
--- a/cliff/app.py
+++ b/cliff/app.py
@@ -122,6 +122,7 @@ class App(object):
         parser = argparse.ArgumentParser(
             description=description,
             add_help=False,
+            allow_abbrev=False,
             **argparse_kwargs
         )
         parser.add_argument(
diff --git a/cliff/command.py b/cliff/command.py
index c49ba5bb..be8ccebf 100644
--- a/cliff/command.py
+++ b/cliff/command.py
@@ -34,6 +34,7 @@ class Command(object):
         parser = argparse.ArgumentParser(
             description=self.get_description(),
             prog=prog_name,
+            allow_abbrev=False,
         )
         return parser
 
diff --git a/cliff/tests/test_app.py b/cliff/tests/test_app.py
index 8ba15142..fefcf6a9 100644
--- a/cliff/tests/test_app.py
+++ b/cliff/tests/test_app.py
@@ -264,8 +264,7 @@ def test_option_parser_abbrev_issue():
         def build_option_parser(self, description, version):
             parser = super(MyApp, self).build_option_parser(
                 description,
-                version,
-                argparse_kwargs={'allow_abbrev': False})
+                version)
             parser.add_argument('--endpoint')
             return parser