From 9a6787c87f5f9d5ba7f78701d24bc3f422aeb1e7 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Mon, 16 Mar 2026 16:08:51 -0400
Subject: [PATCH 1/2] test: clean up instance in test

Change-Id: Ib3a73e2cc24f7e27fd346eb80b7ec5175e3c11a4
---
 .../cloud/bigtable/admin/v2/it/BigtableBackupIT.java  | 11 ++++++++++-
 .../cloud/bigtable/admin/v2/it/BigtableCmekIT.java    |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
index 9f61b6190f..b5ac39e67a 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
@@ -80,6 +80,7 @@ public class BigtableBackupIT {
   private static String targetClusterHot;
   private static Table testTable;
   private static Table testTableHot;
+  private static Instance testInstance;
 
   @BeforeClass
   public static void setUpClass() throws InterruptedException, IOException {
@@ -98,8 +99,9 @@ public static void setUpClass() throws InterruptedException, IOException {
     String newInstanceId = PrefixGenerator.newPrefix("backupIT");
     targetClusterHot = newInstanceId + "-c1";
 
-    instanceAdmin.createInstance(
+    testInstance = instanceAdmin.createInstance(
         CreateInstanceRequest.of(newInstanceId)
+            .setDisplayName("BigtableBackupIT")
             .addCluster(targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
 
     tableAdminHot =
@@ -122,6 +124,13 @@ public static void tearDownClass() {
         // Ignore.
       }
     }
+    if (testInstance != null) {
+      try {
+        instanceAdmin.deleteInstance(testInstance.getId());
+      } catch (Exception e) {
+        LOGGER.log(Level.WARNING, "Failed to clean up instance ", e);
+      }
+    }
   }
 
   private static void deleteBackupIgnoreErrors(
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
index 933750843a..4d3d05f5b4 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
@@ -115,6 +115,7 @@ public static void validatePlatform() throws IOException {
     LOGGER.info("Creating cluster in zone: " + zones.get(0));
     instanceAdmin.createInstance(
         CreateInstanceRequest.of(instanceId)
+            .setDisplayName("BigtableCmekIT")
             .addCmekCluster(clusterId1, zones.get(0), 1, StorageType.SSD, kmsKeyName));
     // Create a table. Key is inherited from the cluster configuration
     tableAdmin.createTable(CreateTableRequest.of(TEST_TABLE_ID).addFamily("cf"));

From 63d44a926168ed36bb12b830e15dc4a4f51f6b21 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Mon, 16 Mar 2026 21:29:57 -0400
Subject: [PATCH 2/2] format

Change-Id: I41393dc1a87fffa0e8ec72d791a80f6e1434ab65
---
 .../cloud/bigtable/admin/v2/it/BigtableBackupIT.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
index b5ac39e67a..eabaa128bc 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
@@ -99,10 +99,12 @@ public static void setUpClass() throws InterruptedException, IOException {
     String newInstanceId = PrefixGenerator.newPrefix("backupIT");
     targetClusterHot = newInstanceId + "-c1";
 
-    testInstance = instanceAdmin.createInstance(
-        CreateInstanceRequest.of(newInstanceId)
-            .setDisplayName("BigtableBackupIT")
-            .addCluster(targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
+    testInstance =
+        instanceAdmin.createInstance(
+            CreateInstanceRequest.of(newInstanceId)
+                .setDisplayName("BigtableBackupIT")
+                .addCluster(
+                    targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
 
     tableAdminHot =
         BigtableTableAdminClient.create(