diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
index cad9f21909f3..358d2990c5bb 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
@@ -118,7 +118,7 @@ public void testCreateTable() {
             .build();
 
     com.google.bigtable.admin.v2.Table expectedResponse =
-        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
+        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
 
     Mockito.when(mockCreateTableCallable.futureCall(expectedRequest))
         .thenReturn(ApiFutures.immediateFuture(expectedResponse));
@@ -164,7 +164,7 @@ public void testModifyFamilies() {
   public void testDeleteTable() {
     // Setup
     DeleteTableRequest expectedRequest =
-        DeleteTableRequest.newBuilder().setName(TABLE_NAME.toString()).build();
+        DeleteTableRequest.newBuilder().setName(TABLE_NAME).build();
 
     final AtomicBoolean wasCalled = new AtomicBoolean(false);
 
@@ -189,13 +189,10 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
   public void testGetTable() {
     // Setup
     GetTableRequest expectedRequest =
-        GetTableRequest.newBuilder()
-            .setName(TABLE_NAME.toString())
-            .setView(View.SCHEMA_VIEW)
-            .build();
+        GetTableRequest.newBuilder().setName(TABLE_NAME).setView(View.SCHEMA_VIEW).build();
 
     com.google.bigtable.admin.v2.Table expectedResponse =
-        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
+        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
 
     Mockito.when(mockGetTableCallable.futureCall(expectedRequest))
         .thenReturn(ApiFutures.immediateFuture(expectedResponse));
@@ -286,7 +283,6 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
   @Test
   public void testAwaitReplication() {
     // Setup
-    @SuppressWarnings("UnnecessaryLocalVariable")
     TableName expectedRequest = TableName.parse(TABLE_NAME);
 
     final AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -312,7 +308,7 @@ public ApiFuture<Void> answer(InvocationOnMock invocationOnMock) {
   public void testExistsTrue() {
     // Setup
     com.google.bigtable.admin.v2.Table expectedResponse =
-        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
+        com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
 
     Mockito.when(mockGetTableCallable.futureCall(Matchers.any(GetTableRequest.class)))
         .thenReturn(ApiFutures.immediateFuture(expectedResponse));