From 4b853344118b8630cce4f94c568590260c06c328 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 | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 9654ee884..c10df74e2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,17 +11,10 @@
 
 from pytest import fixture
 
-from inbox.util.testutils import (
-    dump_dns_queries,  # noqa
-    files,  # noqa
-    mock_dns_resolver,  # noqa
-    mock_imapclient,  # noqa
-    mock_smtp_get_connection,  # noqa
-    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