diff --git a/superset/databases/commands/create.py b/superset/databases/commands/create.py
index 115652bc69f7..c438444d043e 100644
--- a/superset/databases/commands/create.py
+++ b/superset/databases/commands/create.py
@@ -30,6 +30,7 @@
     DatabaseInvalidError,
     DatabaseRequiredFieldValidationError,
 )
+from superset.databases.commands.test_connection import TestConnectionDatabaseCommand
 from superset.databases.dao import DatabaseDAO
 from superset.extensions import db, security_manager
 
@@ -46,13 +47,15 @@ def run(self) -> Model:
         try:
             database = DatabaseDAO.create(self._properties, commit=False)
             database.set_sqlalchemy_uri(database.sqlalchemy_uri)
-            # adding a new database we always want to force refresh schema list
-            # TODO Improve this simplistic implementation for catching DB conn fails
+
             try:
-                schemas = database.get_all_schema_names()
+                TestConnectionDatabaseCommand(self._actor, self._properties).run()
             except Exception:
                 db.session.rollback()
                 raise DatabaseConnectionFailedError()
+
+            # adding a new database we always want to force refresh schema list
+            schemas = database.get_all_schema_names(cache=False)
             for schema in schemas:
                 security_manager.add_permission_view_menu(
                     "schema_access", security_manager.get_schema_perm(database, schema)
diff --git a/tests/databases/api_tests.py b/tests/databases/api_tests.py
index 62a14005932b..977b4b135aad 100644
--- a/tests/databases/api_tests.py
+++ b/tests/databases/api_tests.py
@@ -16,28 +16,20 @@
 # under the License.
 # isort:skip_file
 """Unit tests for Superset"""
-import datetime
 import json
 from io import BytesIO
 from zipfile import is_zipfile
 
-import pandas as pd
 import prison
 import pytest
-import random
 
-from sqlalchemy import String, Date, Float
 from sqlalchemy.sql import func
 
-from superset import db, security_manager, ConnectorRegistry
+from superset import db, security_manager
 from superset.connectors.sqla.models import SqlaTable
 from superset.models.core import Database
 from superset.utils.core import get_example_database, get_main_database
 from tests.base_tests import SupersetTestCase
-from tests.dashboard_utils import (
-    create_table_for_dashboard,
-    create_dashboard,
-)
 from tests.fixtures.certificates import ssl_certificate
 from tests.fixtures.unicode_dashboard import load_unicode_dashboard_with_position
 from tests.test_app import app
@@ -154,7 +146,7 @@ def test_create_database(self):
         if example_db.backend == "sqlite":
             return
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-database",
             "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
             "server_cert": ssl_certificate,
             "extra": json.dumps(extra),
@@ -179,7 +171,7 @@ def test_create_database_server_cert_validate(self):
 
         self.login(username="admin")
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-database-invalid-cert",
             "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
             "server_cert": "INVALID CERT",
         }
@@ -201,7 +193,7 @@ def test_create_database_json_validate(self):
 
         self.login(username="admin")
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-database-invalid-json",
             "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
             "encrypted_extra": '{"A": "a", "B", "C"}',
             "extra": '["A": "a", "B", "C"]',
@@ -241,7 +233,7 @@ def test_create_database_extra_metadata_validate(self):
         }
         self.login(username="admin")
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-database-invalid-extra",
             "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
             "extra": json.dumps(extra),
         }
@@ -289,7 +281,7 @@ def test_create_database_uri_validate(self):
         """
         self.login(username="admin")
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-database-invalid-uri",
             "sqlalchemy_uri": "wrong_uri",
         }
 
@@ -314,7 +306,7 @@ def test_create_database_fail_sqllite(self):
         Database API: Test create fail with sqllite
         """
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-sqlite-database",
             "sqlalchemy_uri": "sqlite:////some.db",
         }
 
@@ -342,7 +334,7 @@ def test_create_database_conn_fail(self):
             return
         example_db.password = "wrong_password"
         database_data = {
-            "database_name": "test-database",
+            "database_name": "test-create-database-wrong-password",
             "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
         }
 
@@ -362,11 +354,11 @@ def test_update_database(self):
         test_database = self.insert_database(
             "test-database", example_db.sqlalchemy_uri_decrypted
         )
-
         self.login(username="admin")
         database_data = {"database_name": "test-database-updated"}
         uri = f"api/v1/database/{test_database.id}"
         rv = self.client.put(uri, json=database_data)
+        print(rv.data.decode("utf-8"), database_data)
         self.assertEqual(rv.status_code, 200)
         # Cleanup
         model = db.session.query(Database).get(test_database.id)
diff --git a/tests/superset_test_config.py b/tests/superset_test_config.py
index f74272e61f16..422d57a76800 100644
--- a/tests/superset_test_config.py
+++ b/tests/superset_test_config.py
@@ -88,6 +88,11 @@ def GET_FEATURE_FLAGS_FUNC(ff):
     "CACHE_REDIS_URL": f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_CACHE_DB}",
 }
 
+TABLE_NAMES_CACHE_CONFIG = {
+    **CACHE_CONFIG,
+    "CACHE_KEY_PREFIX": "superset_data_cache",
+}
+
 
 class CeleryConfig(object):
     BROKER_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_CELERY_DB}"