diff --git a/unittests/test_error_handling.py b/unittests/test_error_handling.py
index 94e3d6f09407ff8b9fea1df28c4daa1ac8e818c9..489f3e299a8be1a1e450a3724c1a11c6c0b839c0 100644
--- a/unittests/test_error_handling.py
+++ b/unittests/test_error_handling.py
@@ -28,7 +28,6 @@ children.
 """
 import caosdb as db
 from caosdb.common.models import raise_errors
-# TODO: Import the relevant error classes once they have been finalized.
 from caosdb.exceptions import (AmbiguityException,
                                AuthorizationException,
                                EntityDoesNotExistError, EntityError,
@@ -37,7 +36,6 @@ from caosdb.exceptions import (AmbiguityException,
                                UnqualifiedParentsError,
                                UnqualifiedPropertiesError)
 
-import pytest  # TODO: remove when xfails have been dealt with
 from pytest import raises