diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index 1312c588..19c43476 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -13,7 +13,7 @@ import os
 import warnings
 import sys
 
-from parso import load_python_grammar
+import parso
 from parso.python import tree
 from parso.utils import source_to_unicode, splitlines
 
@@ -124,7 +124,7 @@ class Script(object):
 
         cache.clear_time_caches()
         debug.reset_time()
-        self._grammar = load_python_grammar(version='%s.%s' % sys.version_info[:2])
+        self._grammar = parso.load_grammar(version='%s.%s' % sys.version_info[:2])
         if sys_path is None:
             venv = os.getenv('VIRTUAL_ENV')
             if venv:
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index d8844166..0f5e094d 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -64,7 +64,7 @@ import copy
 import sys
 
 from parso.python import tree
-from parso import load_python_grammar
+import parso
 
 from jedi import debug
 from jedi.common import unite
@@ -89,7 +89,7 @@ from jedi import parser_utils
 class Evaluator(object):
     def __init__(self, grammar, sys_path=None):
         self.grammar = grammar
-        self.latest_grammar = load_python_grammar('3.6')
+        self.latest_grammar = parso.load_grammar('3.6')
         self.memoize_cache = {}  # for memoize decorators
         # To memorize modules -> equals `sys.modules`.
         self.modules = {}  # like `sys.modules`.