diff --git a/tests/test_core/_base.py b/tests/test_core/core_base.py
similarity index 100%
rename from tests/test_core/_base.py
rename to tests/test_core/core_base.py
diff --git a/tests/test_core/test_model.py b/tests/test_core/test_model.py
index 4723d457..a6d183a5 100644
--- a/tests/test_core/test_model.py
+++ b/tests/test_core/test_model.py
@@ -1,5 +1,5 @@
 from dooit.api.workspace import Workspace
-from tests.test_core._base import CoreTestBase
+from tests.test_core.core_base import CoreTestBase
 
 
 class TestModel(CoreTestBase):
diff --git a/tests/test_core/test_todo.py b/tests/test_core/test_todo.py
index 6f642b07..ad31c5f4 100644
--- a/tests/test_core/test_todo.py
+++ b/tests/test_core/test_todo.py
@@ -1,6 +1,6 @@
 from sqlalchemy import select
 from dooit.api.exceptions import NoParentError, MultipleParentError
-from tests.test_core._base import CoreTestBase
+from tests.test_core.core_base import CoreTestBase
 from dooit.api import Todo, Workspace
 
 
diff --git a/tests/test_core/test_workspace.py b/tests/test_core/test_workspace.py
index 14b4a3da..396c1bb7 100644
--- a/tests/test_core/test_workspace.py
+++ b/tests/test_core/test_workspace.py
@@ -1,4 +1,4 @@
-from tests.test_core._base import CoreTestBase
+from tests.test_core.core_base import CoreTestBase
 from dooit.api import Workspace
 
 
diff --git a/tests/test_ui/test_startup.py b/tests/test_ui/test_startup.py
index 886ed796..c56af7dd 100644
--- a/tests/test_ui/test_startup.py
+++ b/tests/test_ui/test_startup.py
@@ -1,4 +1,4 @@
-from tests.test_ui._base import run_pilot
+from tests.test_ui.ui_base import run_pilot
 
 
 async def test_startup():
diff --git a/tests/test_ui/_base.py b/tests/test_ui/ui_base.py
similarity index 100%
rename from tests/test_ui/_base.py
rename to tests/test_ui/ui_base.py