diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.reference b/tests/queries/0_stateless/02096_rename_atomic_hang.reference
new file mode 100644
index 00000000000..f0073e8f708
--- /dev/null
+++ b/tests/queries/0_stateless/02096_rename_atomic_hang.reference
@@ -0,0 +1,2 @@
+2000
+2000
diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.sql b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
new file mode 100644
index 00000000000..96261bfe127
--- /dev/null
+++ b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
@@ -0,0 +1,20 @@
+-- Tags: no-parallel
+
+drop database if exists db_hang;
+drop database if exists db_hang_temp;
+create database db_hang engine=Ordinary;
+use db_hang;
+create table db_hang.test(A Int64) Engine=MergeTree order by A;
+create materialized view db_hang.test_mv(A Int64) Engine=MergeTree order by A as select * from db_hang.test;
+insert into db_hang.test select * from numbers(1000);
+
+create database db_hang_temp engine=Atomic;
+rename table db_hang.test to db_hang_temp.test;
+rename table db_hang.test_mv to db_hang_temp.test_mv;
+
+drop database db_hang;
+rename database db_hang_temp to db_hang;
+insert into db_hang.test select * from numbers(1000);
+select count() from db_hang.test;
+select count() from db_hang.test_mv;
+drop database db_hang;