diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py
index a17f7808..4086ba10 100644
--- a/jedi/api/helpers.py
+++ b/jedi/api/helpers.py
@@ -6,7 +6,7 @@ from collections import namedtuple
 
 from jedi._compatibility import u
 from jedi.evaluate.helpers import evaluate_call_of_leaf
-from jedi import parser
+from jedi.parser.python.parser import Parser
 from jedi.parser.python import tree
 from jedi.parser import tokenize
 from jedi.cache import time_cache
@@ -132,7 +132,7 @@ def get_stack_at_position(grammar, code_lines, module_node, pos):
     safeword = 'ZZZ_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI'
     code = code + safeword
 
-    p = parser.Parser(grammar, code, error_recovery=True)
+    p = Parser(grammar, code, error_recovery=True)
     try:
         p.parse(tokens=tokenize_without_endmarker(code))
     except EndMarkerReached:
diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py
index 731197fa..d9e7c8db 100644
--- a/jedi/parser/__init__.py
+++ b/jedi/parser/__init__.py
@@ -1,5 +1,4 @@
 from jedi.parser.parser import ParserSyntaxError
-from jedi.parser.python.parser import Parser
 from jedi.parser.pgen2.pgen import generate_grammar
 from jedi.parser import python
 
diff --git a/test/test_parser/test_diff_parser.py b/test/test_parser/test_diff_parser.py
index 72db9a24..064f4658 100644
--- a/test/test_parser/test_diff_parser.py
+++ b/test/test_parser/test_diff_parser.py
@@ -8,7 +8,7 @@ from jedi.common import splitlines
 from jedi import cache
 from jedi.parser.python import load_grammar
 from jedi.parser.python.diff import DiffParser
-from jedi.parser import Parser
+from jedi.parser.python.parser import Parser
 from jedi.parser.tokenize import source_tokens