diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide5.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide5.java
index a23234af8e13..19256fd838b9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide5.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide5.java
@@ -968,7 +968,7 @@ public void testScanMetrics() throws Exception {
           numRecords++;
         }
 
-        LOG.info("test data has " + numRecords + " records.");
+        LOG.info("test data has {} records.", numRecords);
 
         // by default, scan metrics collection is turned off
         assertNull(scanner.getScanMetrics());
@@ -981,8 +981,6 @@ public void testScanMetrics() throws Exception {
       try (ResultScanner scanner = ht.getScanner(scan2)) {
         for (Result result : scanner.next(numRecords - 1)) {
         }
-        scanner.close();
-        // closing the scanner will set the metrics.
         assertNotNull(scanner.getScanMetrics());
       }
 
@@ -997,7 +995,7 @@ public void testScanMetrics() throws Exception {
         }
         ScanMetrics scanMetrics = scanner.getScanMetrics();
         assertEquals("Did not access all the regions in the table", numOfRegions,
-                scanMetrics.countOfRegions.get());
+          scanMetrics.countOfRegions.get());
       }
 
       // check byte counters
@@ -1006,15 +1004,14 @@ public void testScanMetrics() throws Exception {
       scan2.setCaching(1);
       try (ResultScanner scanner = ht.getScanner(scan2)) {
         int numBytes = 0;
-        for (Result result : scanner.next(1)) {
+        for (Result result : scanner) {
           for (Cell cell : result.listCells()) {
             numBytes += PrivateCellUtil.estimatedSerializedSizeOf(cell);
           }
         }
-        scanner.close();
         ScanMetrics scanMetrics = scanner.getScanMetrics();
         assertEquals("Did not count the result bytes", numBytes,
-                scanMetrics.countOfBytesInResults.get());
+          scanMetrics.countOfBytesInResults.get());
       }
 
       // check byte counters on a small scan
@@ -1024,15 +1021,14 @@ public void testScanMetrics() throws Exception {
       scan2.setSmall(true);
       try (ResultScanner scanner = ht.getScanner(scan2)) {
         int numBytes = 0;
-        for (Result result : scanner.next(1)) {
+        for (Result result : scanner) {
           for (Cell cell : result.listCells()) {
             numBytes += PrivateCellUtil.estimatedSerializedSizeOf(cell);
           }
         }
-        scanner.close();
         ScanMetrics scanMetrics = scanner.getScanMetrics();
         assertEquals("Did not count the result bytes", numBytes,
-                scanMetrics.countOfBytesInResults.get());
+          scanMetrics.countOfBytesInResults.get());
       }
 
       // now, test that the metrics are still collected even if you don't call close, but do
@@ -1062,8 +1058,10 @@ public void testScanMetrics() throws Exception {
         scannerWithClose.close();
         ScanMetrics scanMetricsWithClose = scannerWithClose.getScanMetrics();
         assertEquals("Did not access all the regions in the table", numOfRegions,
-                scanMetricsWithClose.countOfRegions.get());
+          scanMetricsWithClose.countOfRegions.get());
       }
+    } finally {
+      TEST_UTIL.deleteTable(tableName);
     }
   }