diff --git a/mypy/main.py b/mypy/main.py
index fe054d975dba..965361b34c5f 100644
--- a/mypy/main.py
+++ b/mypy/main.py
@@ -427,7 +427,7 @@ def add_invertible_flag(flag: str,
     parser.add_argument('--strict-optional', action='store_true',
                         help=argparse.SUPPRESS)
     parser.add_argument('--no-strict-optional', action='store_false', dest='strict_optional',
-                        help="disable strict Optional checks (inverse: --no-strict-optional)")
+                        help="disable strict Optional checks (inverse: --strict-optional)")
     parser.add_argument('--strict-optional-whitelist', metavar='GLOB', nargs='*',
                         help="suppress strict Optional errors in all but the provided files "
                         "(experimental -- read documentation before using!).  "
diff --git a/runtests.py b/runtests.py
index 527cf4db7f85..ad7b82f46f51 100755
--- a/runtests.py
+++ b/runtests.py
@@ -273,6 +273,7 @@ def add_stdlibsamples(driver: Driver) -> None:
                 seen.add(module)
                 modules.append(module)
         if modules:
+            # TODO: Remove need for --no-strict-optional
             driver.add_mypy_modules('stdlibsamples (%s)' % (version,), modules,
                                     cwd=stdlibsamples_dir, extra_args=['--no-strict-optional'])