diff --git a/tests/goth/conftest.py b/tests/goth/conftest.py
index 85da6f3f9..d1f432361 100644
--- a/tests/goth/conftest.py
+++ b/tests/goth/conftest.py
@@ -1,11 +1,11 @@
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import cast, List, Tuple
+from typing import cast, List
 
 import pytest
 
 from goth.configuration import Override
-from yapapi.package import Package, vm
+from yapapi.package import vm
 
 
 def pytest_addoption(parser):
diff --git a/tests/goth/test_run_blender.py b/tests/goth/test_run_blender.py
index fc54dd047..f224622ea 100644
--- a/tests/goth/test_run_blender.py
+++ b/tests/goth/test_run_blender.py
@@ -10,7 +10,11 @@
 from goth.runner import Runner
 from goth.runner.probe import RequestorProbe
 
-from .assertions import assert_no_errors, assert_all_invoices_accepted, assert_tasks_processed
+from tests.goth.assertions import (
+    assert_no_errors,
+    assert_all_invoices_accepted,
+    assert_tasks_processed,
+)
 
 
 logger = logging.getLogger("goth.test.run_blender")
diff --git a/tests/goth/test_simple_service.py b/tests/goth/test_run_simple_service.py
similarity index 96%
rename from tests/goth/test_simple_service.py
rename to tests/goth/test_run_simple_service.py
index 057b9bcea..0aeef2b51 100644
--- a/tests/goth/test_simple_service.py
+++ b/tests/goth/test_run_simple_service.py
@@ -11,7 +11,7 @@
 from goth.runner import Runner
 from goth.runner.probe import RequestorProbe
 
-from .assertions import assert_no_errors, assert_all_invoices_accepted
+from tests.goth.assertions import assert_no_errors, assert_all_invoices_accepted
 
 
 logger = logging.getLogger("goth.test.run_simple_service")
diff --git a/tests/goth/test_run_yacat.py b/tests/goth/test_run_yacat.py
index fe6b26448..840c16d8b 100644
--- a/tests/goth/test_run_yacat.py
+++ b/tests/goth/test_run_yacat.py
@@ -11,7 +11,12 @@
 from goth.runner import Runner
 from goth.runner.probe import RequestorProbe
 
-from .assertions import assert_no_errors, assert_all_invoices_accepted, assert_tasks_processed
+from tests.goth.assertions import (
+    assert_no_errors,
+    assert_all_invoices_accepted,
+    assert_tasks_processed,
+)
+
 
 logger = logging.getLogger("goth.test.run_yacat")