diff --git a/docs/pipext.py b/docs/pipext.py
index c866e1d71..06eed146d 100644
--- a/docs/pipext.py
+++ b/docs/pipext.py
@@ -8,7 +8,7 @@ from docutils import nodes
 from docutils.parsers import rst
 from docutils.statemachine import ViewList
 
-from pip._internal import cmdoptions
+from pip._internal.cli import cmdoptions
 from pip._internal.commands import commands_dict as commands
 
 
diff --git a/src/pip/_internal/cli/autocompletion.py b/src/pip/_internal/cli/autocompletion.py
index 7341815e9..de97463fa 100644
--- a/src/pip/_internal/cli/autocompletion.py
+++ b/src/pip/_internal/cli/autocompletion.py
@@ -5,7 +5,7 @@ import optparse
 import os
 import sys
 
-from pip._internal.cli.baseparser import create_main_parser
+from pip._internal.cli.main_parser import create_main_parser
 from pip._internal.commands import commands_dict, get_summaries
 from pip._internal.utils.misc import get_installed_distributions
 
diff --git a/src/pip/_internal/cli/main_parser.py b/src/pip/_internal/cli/main_parser.py
index 33d91fa38..1774a6b9c 100644
--- a/src/pip/_internal/cli/main_parser.py
+++ b/src/pip/_internal/cli/main_parser.py
@@ -6,7 +6,7 @@ import sys
 
 from pip import __version__
 from pip._internal.cli import cmdoptions
-from pip._internal.cli.base_parser import (
+from pip._internal.cli.parser import (
     ConfigOptionParser, UpdatingDefaultsHelpFormatter,
 )
 from pip._internal.commands import (
diff --git a/tests/lib/options_helpers.py b/tests/lib/options_helpers.py
index ebff291f2..3ba46f6a3 100644
--- a/tests/lib/options_helpers.py
+++ b/tests/lib/options_helpers.py
@@ -3,7 +3,7 @@
 
 import os
 
-from pip._internal import cmdoptions
+from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
 from pip._internal.commands import commands_dict
 
diff --git a/tests/unit/test_cmdoptions.py b/tests/unit/test_cmdoptions.py
index b5b5d70f8..ed482bc8e 100644
--- a/tests/unit/test_cmdoptions.py
+++ b/tests/unit/test_cmdoptions.py
@@ -1,4 +1,5 @@
-from pip._internal import cmdoptions, index
+from pip._internal import index
+from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command