diff --git a/test/test_api/test_completion.py b/test/test_api/test_completion.py
index 1018821c..fed496ab 100644
--- a/test/test_api/test_completion.py
+++ b/test/test_api/test_completion.py
@@ -450,7 +450,7 @@ def test_completion_cache(Script, module_injector):
 
 @pytest.mark.parametrize('module', ['typing', 'os'])
 def test_module_completions(Script, module):
-    for c in Script('import {module}; {module}.'.format(module=module)).completions():
+    for c in Script('import {module}; {module}.'.format(module=module)).complete():
         # Just make sure that there are no errors
         c.type
         c.docstring()
diff --git a/test/test_api/test_documentation.py b/test/test_api/test_documentation.py
index fae16ddb..7f281b27 100644
--- a/test/test_api/test_documentation.py
+++ b/test/test_api/test_documentation.py
@@ -87,7 +87,7 @@ def test_version_info(Script):
 
         sys.version_info"""))
 
-    c, = s.completions()
+    c, = s.complete()
     assert c.docstring() == 'sys.version_info\n\nVersion information as a named tuple.'
 
 
diff --git a/test/test_api/test_interpreter.py b/test/test_api/test_interpreter.py
index e95872f2..b5d601ce 100644
--- a/test/test_api/test_interpreter.py
+++ b/test/test_api/test_interpreter.py
@@ -678,5 +678,5 @@ def bar():
 def test_string_annotation(annotations, result, code):
     x = lambda foo: 1
     x.__annotations__ = annotations
-    defs = jedi.Interpreter(code or 'x()', [locals()]).goto_definitions()
+    defs = jedi.Interpreter(code or 'x()', [locals()]).infer()
     assert [d.name for d in defs] == result
diff --git a/test/test_deprecation.py b/test/test_deprecation.py
index 86706ac2..5c4425c7 100644
--- a/test/test_deprecation.py
+++ b/test/test_deprecation.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import warnings
 
 import pytest
diff --git a/test/test_inference/test_gradual/test_typeshed.py b/test/test_inference/test_gradual/test_typeshed.py
index b1efbd9f..2c7bf9c6 100644
--- a/test/test_inference/test_gradual/test_typeshed.py
+++ b/test/test_inference/test_gradual/test_typeshed.py
@@ -136,10 +136,13 @@ def test_math(Script):
     assert value
 
 
-def test_type_var(Script):
+def test_type_var(Script, environment):
     def_, = Script('import typing; T = typing.TypeVar("T1")').infer()
     assert def_.name == 'TypeVar'
-    assert def_.description == 'class TypeVar'
+    if environment.version_info.major == 2:
+        assert def_.description == 'TypeVar = object()'
+    else:
+        assert def_.description == 'class TypeVar'
 
 
 @pytest.mark.parametrize(