diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableLogicalViewIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableLogicalViewIT.java
index d73d68d48f8f..31aa1b49ddbc 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableLogicalViewIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableLogicalViewIT.java
@@ -35,6 +35,7 @@
 import io.grpc.StatusRuntimeException;
 import java.util.List;
 import java.util.logging.Logger;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -71,6 +72,13 @@ public void setUp() throws InterruptedException {
     testTable = createTestTable(testEnvRule.env().getTableAdminClient());
   }
 
+  @After
+  public void tearDown() throws InterruptedException {
+    if (testTable != null) {
+      testEnvRule.env().getTableAdminClient().deleteTable(testTable.getId());
+    }
+  }
+
   @Test
   public void createLogicalViewAndGetLogicalViewTest() {
     String logicalViewId = prefixGenerator.newPrefix();
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
index 6b71bac5b0c7..063d0d1f5095 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
@@ -104,6 +104,8 @@ public void testOnAuthorizedView()
         .env()
         .getTableAdminClient()
         .deleteAuthorizedView(testAuthorizedView.getTableId(), testAuthorizedView.getId());
+
+    testEnvRule.env().getTableAdminClient().deleteTable(testAuthorizedView.getTableId());
   }
 
   private static AuthorizedView createPreSplitTableAndAuthorizedView() {
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
index 47d6b6ddf97f..7c29e9dcfc8b 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
@@ -167,14 +167,17 @@ void cleanUpStale() throws ExecutionException, InterruptedException, IOException
   private void cleanupStaleTables(String stalePrefix) {
     for (String tableId : env().getTableAdminClient().listTables()) {
       if (!tableId.startsWith(PrefixGenerator.PREFIX)) {
+        LOGGER.info("Skip cleaning up table: " + tableId);
         continue;
       }
       if (stalePrefix.compareTo(tableId) > 0) {
+        LOGGER.info("Preparing stale table for delete: " + tableId);
         prepTableForDelete(tableId);
         try {
+          LOGGER.info("Deleting stable table: " + tableId);
           env().getTableAdminClient().deleteTable(tableId);
-        } catch (NotFoundException ignored) {
-
+        } catch (NotFoundException e) {
+          LOGGER.log(Level.WARNING, "Deleting stale table failed: " + tableId, e);
         }
       }
     }