diff --git a/tests/integration/test_wrong_db_or_table_name/test.py b/tests/integration/test_wrong_db_or_table_name/test.py
index 68af383b6c34..649f5214e82e 100644
--- a/tests/integration/test_wrong_db_or_table_name/test.py
+++ b/tests/integration/test_wrong_db_or_table_name/test.py
@@ -68,7 +68,7 @@ def test_wrong_table_name(start):
     )
     with pytest.raises(
         QueryRuntimeException,
-        match="DB::Exception: Table test.table_test1 does not exist. Maybe you meant table_test?.",
+        match="DB::Exception: Table test.table_test1 does not exist. Maybe you meant test.table_test?.",
     ):
         node.query(
             """
@@ -96,7 +96,7 @@ def test_drop_wrong_table_name(start):
 
     with pytest.raises(
         QueryRuntimeException,
-        match="DB::Exception: Table test.table_tes does not exist. Maybe you meant table_test?.",
+        match="DB::Exception: Table test.table_tes does not exist. Maybe you meant test.table_test?.",
     ):
         node.query("DROP TABLE test.table_tes;")
     assert int(node.query("SELECT count() FROM test.table_test;")) == 1
diff --git a/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.reference b/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.reference
deleted file mode 100644
index 7f4577f9975d..000000000000
--- a/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-1
-OK
-OK
-OK
-1
-OK
diff --git a/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.sh b/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.sh
deleted file mode 100755
index 1680900612c9..000000000000
--- a/tests/queries/0_stateless/02931_better_hint_when_table_doesnt_exist.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-parallel
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS test_02931;"
-$CLICKHOUSE_CLIENT -q "CREATE DATABASE test_02931;"
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_table_02931;"
-
-$CLICKHOUSE_CLIENT -q "SELECT 1 FROM system.numbers LIMIT 1;" 2>&1
-
-$CLICKHOUSE_CLIENT -q "SELECT 1 FROM test_02931.numbers LIMIT 1;" 2>&1 | grep -q -e "Table test_02931.numbers does not exist" -e "Maybe you meant system.numbers?" && echo 'OK' || echo 'FAIL'
-
-$CLICKHOUSE_CLIENT -q "SELECT * FROM test_02931.foo_bar;" 2>&1 | grep -q -e "Table test_02931.foo_bar does not exist" -v -e "Maybe you meant system.foo_bar?" && echo 'OK' || echo 'FAIL'
-
-$CLICKHOUSE_CLIENT -q "SELECT 1 FROM system.numbers2 LIMIT 1;" 2>&1 | grep -q -e "Maybe you meant system.numbers?" -e "Maybe you meant system.numbers?" && echo 'OK' || echo 'FAIL'
-
-$CLICKHOUSE_CLIENT -n --query="CREATE TABLE test_table_02931 (n Int) Engine=MergeTree() ORDER BY n;"
-$CLICKHOUSE_CLIENT -n --query="INSERT INTO TABLE test_table_02931 VALUES(1);"
-$CLICKHOUSE_CLIENT -n --query="SELECT * FROM test_table_02931 LIMIT 1;"
-$CLICKHOUSE_CLIENT -n --query="SELECT * FROM test_02931.test_table_02931 LIMIT 1;" 2>&1 | grep -q -e "Table test_02931.test_table_02931 does not exist" -e "Maybe you meant default.test_table_02931?" && echo 'OK' || echo 'FAIL'
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE test_table_02931;"
-$CLICKHOUSE_CLIENT -q "DROP DATABASE test_02931;"