diff --git a/src/yb/client/client-test.cc b/src/yb/client/client-test.cc
index ea73d927c65..2b58954a98f 100644
--- a/src/yb/client/client-test.cc
+++ b/src/yb/client/client-test.cc
@@ -2425,6 +2425,7 @@ TEST_F(ClientTest, TestCreateTableWithRangePartition) {
   std::unique_ptr<YBTableCreator> table_creator(client_->NewTableCreator());
   const std::string kPgsqlTableName = "pgsqlrangepartitionedtable";
   const std::string kPgsqlTableId = "pgsqlrangepartitionedtableid";
+  const std::string kYqlTableId = "yqlrangepartitionedtableid";
   const size_t kColIdx = 1;
   const int64_t kKeyValue = 48238;
   auto yql_table_name = YBTableName(YQL_DATABASE_CQL, kKeyspaceName, "yqlrangepartitionedtable");
@@ -2472,6 +2473,7 @@ TEST_F(ClientTest, TestCreateTableWithRangePartition) {
 
   // Create a YQL table using range partition.
   s = table_creator->table_name(yql_table_name)
+      .table_id(kYqlTableId)
       .schema(&schema)
       .set_range_partition_columns({"key"})
       .table_type(YBTableType::YQL_TABLE_TYPE)
diff --git a/src/yb/integration-tests/create-table-itest.cc b/src/yb/integration-tests/create-table-itest.cc
index 1c4f5374a07..f07bc7d7aa8 100644
--- a/src/yb/integration-tests/create-table-itest.cc
+++ b/src/yb/integration-tests/create-table-itest.cc
@@ -1027,7 +1027,7 @@ TEST_F(CreateTableITest, OnlyMajorityReplicasWithPlacement) {
   // Try creating a table. It should succeed.
   YBTableName table_name5(kNamespaceType, kNamespaceName, kTableName5);
   std::unique_ptr<client::YBTableCreator> table_creator5(client_->NewTableCreator());
-  ASSERT_OK(table_creator1->table_name(table_name5)
+  ASSERT_OK(table_creator5->table_name(table_name5)
                             .schema(&client_schema)
                             .num_tablets(kNumTablets)
                             .wait(true)
diff --git a/src/yb/integration-tests/xcluster/xcluster_consistency-test.cc b/src/yb/integration-tests/xcluster/xcluster_consistency-test.cc
index 122655bbe78..d8c4bbd0ca0 100644
--- a/src/yb/integration-tests/xcluster/xcluster_consistency-test.cc
+++ b/src/yb/integration-tests/xcluster/xcluster_consistency-test.cc
@@ -171,7 +171,8 @@ class XClusterConsistencyTest : public XClusterYsqlTestBase {
 
       for (const auto& stream_id : stream_ids_) {
         for (const auto& tablet_id : producer_tablet_ids_) {
-          auto metrics = GetXClusterTabletMetrics(*cdc_service, tablet_id, stream_id);
+          auto metrics = GetXClusterTabletMetrics(
+              *cdc_service, tablet_id, stream_id, cdc::CreateMetricsEntityIfNotFound::kFalse);
 
           if (metrics && metrics.get()->last_read_hybridtime->value()) {
             producer_tablet_read_time_[tablet_id] = metrics.get()->last_read_hybridtime->value();
@@ -191,7 +192,8 @@ class XClusterConsistencyTest : public XClusterYsqlTestBase {
 
       for (const auto& stream_id : stream_ids_) {
         for (const auto& tablet_id : producer_tablet_ids_) {
-          auto metrics = GetXClusterTabletMetrics(*cdc_service, tablet_id, stream_id);
+          auto metrics = GetXClusterTabletMetrics(
+              *cdc_service, tablet_id, stream_id, cdc::CreateMetricsEntityIfNotFound::kFalse);
 
           if (metrics &&
               metrics.get()->last_read_hybridtime->value() >
diff --git a/src/yb/tserver/ts_tablet_manager-test.cc b/src/yb/tserver/ts_tablet_manager-test.cc
index 6776810f113..60514dd19d9 100644
--- a/src/yb/tserver/ts_tablet_manager-test.cc
+++ b/src/yb/tserver/ts_tablet_manager-test.cc
@@ -182,7 +182,9 @@ class TsTabletManagerTest : public YBTest {
     auto partition = tablet::CreateDefaultPartition(full_schema);
 
     auto table_info = std::make_shared<tablet::TableInfo>(
-        "TEST: ", tablet::Primary::kTrue, table_id, tablet_id, tablet_id,
+        "TEST: ", tablet::Primary::kTrue, /*table_id=*/table_id,
+        /*namespace_name=*/table_id + "_namespace",
+        /*table_name=*/table_id + "_table_name",
         TableType::DEFAULT_TABLE_TYPE, full_schema, qlexpr::IndexMap(),
         std::nullopt /* index_info */, 0 /* schema_version */, partition.first,
         "" /* pg_table_id */, tablet::SkipTableTombstoneCheck::kFalse);