diff --git a/tests/database_api_tests.py b/tests/database_api_tests.py
index 0360f6274..f060a2c4e 100644
--- a/tests/database_api_tests.py
+++ b/tests/database_api_tests.py
@@ -21,6 +21,7 @@ import json
 import prison
 from sqlalchemy.sql import func
 
+import tests.test_app
 from superset import db, security_manager
 from superset.connectors.sqla.models import SqlaTable
 from superset.models.core import Database
diff --git a/tests/query_context_tests.py b/tests/query_context_tests.py
index 84f54da0c..e27c0af75 100644
--- a/tests/query_context_tests.py
+++ b/tests/query_context_tests.py
@@ -14,8 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from typing import Any, Dict, List, Optional
-
+import tests.test_app
 from superset import db
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.common.query_context import QueryContext
@@ -23,7 +22,6 @@ from superset.connectors.connector_registry import ConnectorRegistry
 from superset.utils.core import TimeRangeEndpoint
 from tests.base_tests import SupersetTestCase
 from tests.fixtures.query_context import get_query_context
-from tests.test_app import app
 
 
 class QueryContextTests(SupersetTestCase):
diff --git a/tests/security/__init__.py b/tests/security/__init__.py
new file mode 100644
index 000000000..13a83393a
--- /dev/null
+++ b/tests/security/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/tests/security/analytics_db_safety_tests.py b/tests/security/analytics_db_safety_tests.py
index 04a64551e..5d32646e6 100644
--- a/tests/security/analytics_db_safety_tests.py
+++ b/tests/security/analytics_db_safety_tests.py
@@ -19,8 +19,7 @@ from superset.security.analytics_db_safety import (
     check_sqlalchemy_uri,
     DBSecurityException,
 )
-
-from ..base_tests import SupersetTestCase
+from tests.base_tests import SupersetTestCase
 
 
 class DBConnectionsTest(SupersetTestCase):
diff --git a/tests/thumbnails_tests.py b/tests/thumbnails_tests.py
index ac8f16b27..305f314f8 100644
--- a/tests/thumbnails_tests.py
+++ b/tests/thumbnails_tests.py
@@ -24,6 +24,7 @@ from unittest.mock import patch
 from flask_testing import LiveServerTestCase
 from sqlalchemy.sql import func
 
+import tests.test_app
 from superset import db, is_feature_enabled, security_manager, thumbnail_cache
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice