diff --git a/test/base.py b/test/base.py
index 2d303446..a162c82b 100644
--- a/test/base.py
+++ b/test/base.py
@@ -3,34 +3,17 @@ if sys.hexversion < 0x02070000:
     import unittest2 as unittest
 else:
     import unittest
+TestCase = unittest.TestCase
+
 import os
 from os.path import abspath, dirname
 import functools
 
-import jedi
-
-
 test_dir = dirname(abspath(__file__))
 root_dir = dirname(test_dir)
 
-
 sample_int = 1  # This is used in completion/imports.py
 
-
-class TestBase(unittest.TestCase):
-    def get_script(self, src, pos=(None, None), path=None):
-        return jedi.Script(src, pos[0], pos[1], path)
-
-    def __getattr__(self, name):
-        """Allow access to all the Jedi methods with a simplified interface."""
-        if not hasattr(jedi.Script, name):
-            raise AttributeError("Don't use getattr on this without Jedi methods")
-        def action(*args, **kwargs):
-            script = self.get_script(*args, **kwargs)
-            return getattr(script, name)()
-        return action
-
-
 def cwd_at(path):
     """
     Decorator to run function at `path`.
diff --git a/test/conftest.py b/test/conftest.py
index 12a01b13..f5f992da 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -73,7 +73,7 @@ def isolated_jedi_cache(monkeypatch, tmpdir):
     Same as `clean_jedi_cache`, but create the temporary directory for
     each test case (scope='function').
     """
-    settings = base.jedi.settings
+    from jedi import settings
     monkeypatch.setattr(settings, 'cache_directory', str(tmpdir))
 
 
@@ -88,7 +88,7 @@ def clean_jedi_cache(request):
 
     This fixture is activated in ../pytest.ini.
     """
-    settings = base.jedi.settings
+    from jedi import settings
     old = settings.cache_directory
     tmp = tempfile.mkdtemp(prefix='jedi-test-')
     settings.cache_directory = tmp
diff --git a/test/test_defined_names.py b/test/test_defined_names.py
index 922fbe45..decf8659 100644
--- a/test/test_defined_names.py
+++ b/test/test_defined_names.py
@@ -5,10 +5,10 @@ Tests for `api.defined_names`.
 import textwrap
 
 from jedi import api
-from .base import TestBase
+from .base import TestCase
 
 
-class TestDefinedNames(TestBase):
+class TestDefinedNames(TestCase):
 
     def assert_definition_names(self, definitions, names):
         self.assertEqual([d.name for d in definitions], names)