diff --git a/tests/queries/0_stateless/01656_join_defaul_enum.sql b/tests/queries/0_stateless/01656_join_defaul_enum.sql
index 8a0fc089b16..878936da3b5 100644
--- a/tests/queries/0_stateless/01656_join_defaul_enum.sql
+++ b/tests/queries/0_stateless/01656_join_defaul_enum.sql
@@ -1,18 +1,9 @@
-DROP DATABASE IF EXISTS test_01656;
-
-CREATE DATABASE test_01656;
-USE test_01656;
-
-DROP TABLE IF EXISTS table_key;
-DROP TABLE IF EXISTS table_with_enum;
-
-CREATE TABLE table_key (keycol UInt16) ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
+CREATE TABLE table_key (keycol UInt16) ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple()
+as SELECT * FROM VALUES ( (1), (2), (3) );
 
 CREATE TABLE table_with_enum (keycol UInt16, enum_col Enum8('First' = 1,'Second' = 2))
-    ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
-
-INSERT INTO table_key VALUES (1), (2), (3);
-INSERT INTO table_with_enum VALUES (2, 'Second'), (4, 'Second');
+    ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple() 
+as SELECT * FROM VALUES ( (2, 'Second'), (4, 'Second') );
 
 SET join_algorithm = 'hash';
 
@@ -34,7 +25,6 @@ SELECT keycol, enum_col FROM table_with_enum LEFT JOIN table_key USING (keycol)
 SELECT keycol, enum_col FROM table_with_enum RIGHT JOIN table_key USING (keycol) ORDER BY keycol;
 SELECT keycol, enum_col FROM table_with_enum FULL JOIN table_key USING (keycol) ORDER BY keycol;
 
-DROP TABLE IF EXISTS table_key;
-DROP TABLE IF EXISTS table_with_enum;
+DROP TABLE table_key;
+DROP TABLE table_with_enum;
 
-DROP DATABASE IF EXISTS test_01656;