9 files changed, 12 insertions, 12 deletions
diff --git a/tests/test_ipalib/test_backend.py b/tests/test_ipalib/test_backend.py
index 07c5eb00..cd490fe0 100644
--- a/tests/test_ipalib/test_backend.py
+++ b/tests/test_ipalib/test_backend.py
@@ -22,7 +22,7 @@ Test the `ipalib.backend` module.
 """
 
 from ipalib import  backend, plugable, errors
-from tests.tstutil import ClassChecker
+from tests.util import ClassChecker
 
 
 class test_Backend(ClassChecker):
diff --git a/tests/test_ipalib/test_cli.py b/tests/test_ipalib/test_cli.py
index c7b37126..33e4d220 100644
--- a/tests/test_ipalib/test_cli.py
+++ b/tests/test_ipalib/test_cli.py
@@ -21,7 +21,7 @@
 Test the `ipalib.cli` module.
 """
 
-from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker
 from ipalib import cli, plugable
 
 
diff --git a/tests/test_ipalib/test_config.py b/tests/test_ipalib/test_config.py
index a1329fa4..7b12a53e 100644
--- a/tests/test_ipalib/test_config.py
+++ b/tests/test_ipalib/test_config.py
@@ -23,7 +23,7 @@ Test the `ipalib.config` module.
 
 import types
 
-from tests.tstutil import raises
+from tests.util import raises
 from ipalib import config
 
 
diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py
index e2dd60aa..3113ec69 100644
--- a/tests/test_ipalib/test_crud.py
+++ b/tests/test_ipalib/test_crud.py
@@ -21,7 +21,7 @@
 Test the `ipalib.crud` module.
 """
 
-from tests.tstutil import read_only, raises, ClassChecker
+from tests.util import read_only, raises, ClassChecker
 from ipalib import crud, frontend, plugable, config
 
 def get_api():
diff --git a/tests/test_ipalib/test_errors.py b/tests/test_ipalib/test_errors.py
index bb729776..8db810da 100644
--- a/tests/test_ipalib/test_errors.py
+++ b/tests/test_ipalib/test_errors.py
@@ -21,7 +21,7 @@
 Test the `ipalib.errors` module.
 """
 
-from tests.tstutil import raises, ClassChecker
+from tests.util import raises, ClassChecker
 from ipalib import errors
 
 
diff --git a/tests/test_ipalib/test_frontend.py b/tests/test_ipalib/test_frontend.py
index 320e2078..4b1b56cf 100644
--- a/tests/test_ipalib/test_frontend.py
+++ b/tests/test_ipalib/test_frontend.py
@@ -21,8 +21,8 @@
 Test the `ipalib.frontend` module.
 """
 
-from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
-from tests.tstutil import check_TypeError
+from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.util import check_TypeError
 from ipalib import frontend, backend, plugable, errors, ipa_types, config
 
 
diff --git a/tests/test_ipalib/test_ipa_types.py b/tests/test_ipalib/test_ipa_types.py
index 0b8b728e..65d1f63d 100644
--- a/tests/test_ipalib/test_ipa_types.py
+++ b/tests/test_ipalib/test_ipa_types.py
@@ -21,7 +21,7 @@
 Test the `ipalib.ipa_types` module.
 """
 
-from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker
 from ipalib import ipa_types, errors, plugable
 
 
diff --git a/tests/test_ipalib/test_plugable.py b/tests/test_ipalib/test_plugable.py
index bfd7259f..783a450a 100644
--- a/tests/test_ipalib/test_plugable.py
+++ b/tests/test_ipalib/test_plugable.py
@@ -21,9 +21,9 @@
 Test the `ipalib.plugable` module.
 """
 
-from tests.tstutil import raises, no_set, no_del, read_only
-from tests.tstutil import getitem, setitem, delitem
-from tests.tstutil import ClassChecker
+from tests.util import raises, no_set, no_del, read_only
+from tests.util import getitem, setitem, delitem
+from tests.util import ClassChecker
 from ipalib import plugable, errors
 
 
diff --git a/tests/test_ipalib/test_util.py b/tests/test_ipalib/test_util.py
index 5b8b13f7..04ff23f0 100644
--- a/tests/test_ipalib/test_util.py
+++ b/tests/test_ipalib/test_util.py
@@ -21,7 +21,7 @@
 Test the `ipalib.util` module.
 """
 
-from tests.tstutil import raises
+from tests.util import raises
 from ipalib import util