diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 0cd8497d674b..3cae0346dbbe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -160,11 +160,6 @@ public class TestHStore {
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
   private static final String DIR = TEST_UTIL.getDataTestDir("TestStore").toString();
 
-
-  /**
-   * Setup
-   * @throws IOException
-   */
   @Before
   public void setUp() throws IOException {
     qualifiers.clear();
@@ -244,7 +239,6 @@ private HStore init(String methodName, Configuration conf, TableDescriptorBuilde
   /**
    * Test we do not lose data if we fail a flush and then close.
    * Part of HBase-10466
-   * @throws Exception
    */
   @Test
   public void testFlushSizeSizing() throws Exception {
@@ -346,7 +340,7 @@ public void testDeleteExpiredStoreFiles() throws Exception {
     testDeleteExpiredStoreFiles(1);
   }
 
-  /*
+  /**
    * @param minVersions the MIN_VERSIONS for the column family
    */
   public void testDeleteExpiredStoreFiles(int minVersions) throws Exception {
@@ -471,9 +465,9 @@ private static long getLowestTimeStampFromFS(FileSystem fs,
   //////////////////////////////////////////////////////////////////////////////
 
   private static final int BLOCKSIZE_SMALL = 8192;
+
   /**
    * Test for hbase-1686.
-   * @throws IOException
    */
   @Test
   public void testEmptyStoreFile() throws IOException {
@@ -511,7 +505,6 @@ public void testEmptyStoreFile() throws IOException {
 
   /**
    * Getting data from memstore only
-   * @throws IOException
    */
   @Test
   public void testGet_FromMemStoreOnly() throws IOException {
@@ -566,7 +559,6 @@ private void testTimeRangeIfSomeCellsAreDroppedInFlush(int maxVersion) throws IO
 
   /**
    * Getting data from files only
-   * @throws IOException
    */
   @Test
   public void testGet_FromFilesOnly() throws IOException {
@@ -605,7 +597,6 @@ public void testGet_FromFilesOnly() throws IOException {
 
   /**
    * Getting data from memstore and files
-   * @throws IOException
    */
   @Test
   public void testGet_FromMemStoreAndFiles() throws IOException {
@@ -734,7 +725,7 @@ static class FaultyFileSystem extends FilterFileSystem {
 
     public FaultyFileSystem() {
       super(new LocalFileSystem());
-      System.err.println("Creating faulty!");
+      LOG.info("Creating faulty!");
     }
 
     @Override
@@ -773,7 +764,7 @@ public FaultyOutputStream(FSDataOutputStream out, long faultPos, final AtomicBoo
 
     @Override
     public synchronized void write(byte[] buf, int offset, int length) throws IOException {
-      System.err.println("faulty stream write at pos " + getPos());
+      LOG.info("faulty stream write at pos " + getPos());
       injectFault();
       super.write(buf, offset, length);
     }
@@ -794,13 +785,9 @@ private static void flushStore(HStore store, long id) throws IOException {
 
   /**
    * Generate a list of KeyValues for testing based on given parameters
-   * @param timestamps
-   * @param numRows
-   * @param qualifier
-   * @param family
    * @return the rows key-value list
    */
-  List<Cell> getKeyValueSet(long[] timestamps, int numRows,
+  private List<Cell> getKeyValueSet(long[] timestamps, int numRows,
       byte[] qualifier, byte[] family) {
     List<Cell> kvList = new ArrayList<>();
     for (int i=1;i<=numRows;i++) {
@@ -1027,7 +1014,7 @@ public void testRefreshStoreFilesNotChanged() throws IOException {
     assertEquals(0, this.store.getStorefilesCount());
 
     // add some data, flush
-    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);
+    this.store.add(new KeyValue(row, family, qf1, 1, (byte[]) null), null);
     flush(1);
     // add one more file
     addStoreFile();
@@ -1042,17 +1029,16 @@ public void testRefreshStoreFilesNotChanged() throws IOException {
     // call second time
     spiedStore.refreshStoreFiles();
 
-    //ensure that replaceStoreFiles is not called if files are not refreshed
-    verify(spiedStore, times(0)).replaceStoreFiles(null, null);
+    // ensure that replaceStoreFiles is not called, i.e, the times does not change, if files are not
+    // refreshed,
+    verify(spiedStore, times(1)).replaceStoreFiles(any(), any());
   }
 
   private long countMemStoreScanner(StoreScanner scanner) {
     if (scanner.currentScanners == null) {
       return 0;
     }
-    return scanner.currentScanners.stream()
-            .filter(s -> !s.isFileScanner())
-            .count();
+    return scanner.currentScanners.stream().filter(s -> !s.isFileScanner()).count();
   }
 
   @Test
@@ -1468,8 +1454,6 @@ public void testReclaimChunkWhenScaning() throws IOException {
    * may change the versionedList. And the first InMemoryFlushRunnable will use the chagned
    * versionedList to remove the corresponding segments.
    * In short, there will be some segements which isn't in merge are removed.
-   * @throws IOException
-   * @throws InterruptedException
    */
   @Test
   public void testRunDoubleMemStoreCompactors() throws IOException, InterruptedException {