diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index f79eb800b66..0b7fb3e5431 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -132,7 +132,15 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         bool old_style_database = context.getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
         auto engine = std::make_shared<ASTFunction>();
         auto storage = std::make_shared<ASTStorage>();
-        engine->name = old_style_database ? "Ordinary" : "Atomic";
+        //FIXME revert it before merge
+        engine->name = "Atomic";
+        if (old_style_database)
+        {
+            engine = makeASTFunction("Replicated",
+                                     std::make_shared<ASTLiteral>(fmt::format("/clickhouse/db/{}/", create.database)),
+                                     std::make_shared<ASTLiteral>("s1"),
+                                     std::make_shared<ASTLiteral>("r1"));
+        }
         storage->set(storage->engine, engine);
         create.set(create.storage, storage);
     }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 24405a5be27..0b44206a2b2 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -294,7 +294,12 @@ Block DDLQueryStatusInputStream::readImpl()
         res = sample.cloneWithColumns(std::move(columns));
     }
 
-    return res;
+    //FIXME revert it before merge
+    bool is_functional_tests = !by_hostname && context.getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
+    if (is_functional_tests)
+        return {};
+    else
+        return res;
 }
 
 Strings DDLQueryStatusInputStream::getChildrenAllowNoNode(const std::shared_ptr<zkutil::ZooKeeper> & zookeeper, const String & node_path)