diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 847aab84308..2620ce94b6d 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -15,9 +15,9 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_TABLE;
     extern const int TABLE_ALREADY_EXISTS;
-    extern const int FILE_DOESNT_EXIST;
     extern const int CANNOT_ASSIGN_ALTER;
     extern const int DATABASE_NOT_EMPTY;
+    extern const int NOT_IMPLEMENTED;
 }
 
 class AtomicDatabaseTablesSnapshotIterator final : public DatabaseTablesSnapshotIterator
@@ -134,7 +134,7 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
         db.tryCreateSymlink(table_name_, table_data_path_);
     };
 
-    auto assertCanMoveMatView = [inside_database](const StoragePtr & table_)
+    auto assert_can_move_mat_view = [inside_database](const StoragePtr & table_)
     {
         if (inside_database)
             return;
@@ -165,12 +165,12 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
     }
 
     StoragePtr table = getTableUnlocked(table_name);
-    assertCanMoveMatView(table);
+    assert_can_move_mat_view(table);
     StoragePtr other_table;
     if (exchange)
     {
         other_table = other_db.getTableUnlocked(to_table_name);
-        assertCanMoveMatView(other_table);
+        assert_can_move_mat_view(other_table);
     }
 
     if (exchange)
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index a85adcf5887..0877bcf2b8d 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -36,7 +36,6 @@ namespace ErrorCodes
     extern const int INCORRECT_FILE_NAME;
     extern const int SYNTAX_ERROR;
     extern const int TABLE_ALREADY_EXISTS;
-    extern const int UNKNOWN_TABLE;
     extern const int DICTIONARY_ALREADY_EXISTS;
     extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
 }
diff --git a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
index 87976cec96a..3720a8907b5 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -22,4 +22,5 @@ $CLICKHOUSE_CLIENT -q "ATTACH DATABASE test_01107 ENGINE=Atomic"
 $CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM test_01107.mt"
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_01107.mt SELECT number + sleepEachRow(3) FROM numbers(100)" &
+sleep 1
 $CLICKHOUSE_CLIENT -q "DROP DATABASE test_01107"
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 26feda6b5b8..6754a79beda 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -5,6 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS test_01114_1"
 $CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS test_01114_2"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS test_01114_3"
 
 
 $CLICKHOUSE_CLIENT -q "CREATE DATABASE test_01114_1 ENGINE=Atomic"