From b546e7185fdd74e1ea1c19913a3dc99d9f31180b Mon Sep 17 00:00:00 2001
From: Vyacheslav Tverskoy <tsx@tsx.su>
Date: Thu, 1 Feb 2024 06:29:40 +0000
Subject: [PATCH] Fix imports in conftest

---
 tests/conftest.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 9b5b6ba43..6cf3d81bf 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,15 +11,10 @@
 
 from pytest import fixture
 
-from inbox.util.testutils import dump_dns_queries  # noqa
-from inbox.util.testutils import files  # noqa
-from inbox.util.testutils import mock_dns_resolver  # noqa
-from inbox.util.testutils import mock_imapclient  # noqa
-from inbox.util.testutils import mock_smtp_get_connection  # noqa
-from inbox.util.testutils import uploaded_file_ids  # noqa
-
 from tests.api.base import TestAPIClient
-from tests.util.base import *  # noqa
+
+# Additional fixtures
+pytest_plugins = ["inbox.util.testutils", "tests.util.base"]
 
 
 @fixture