diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java
index 6f55ec29b9a..2cd0bd37744 100644
--- a/src/main/java/org/tikv/common/TiConfiguration.java
+++ b/src/main/java/org/tikv/common/TiConfiguration.java
@@ -655,10 +655,53 @@ public long getGrpcHealthCheckTimeout() {
     return this.grpcHealthCheckTimeout;
   }
 
+  public void setGrpcHealthCheckTimeout(int grpcHealthCheckTimeout) {
+    this.grpcHealthCheckTimeout = grpcHealthCheckTimeout;
+  }
+
   public long getHealthCheckPeriodDuration() {
     return this.healthCheckPeriodDuration;
   }
 
+<<<<<<< HEAD
+=======
+  public void setHealthCheckPeriodDuration(int healthCheckPeriodDuration) {
+    this.healthCheckPeriodDuration = healthCheckPeriodDuration;
+  }
+
+  public boolean isEnableAtomicForCAS() {
+    return enableAtomicForCAS;
+  }
+
+  public void setEnableAtomicForCAS(boolean enableAtomicForCAS) {
+    this.enableAtomicForCAS = enableAtomicForCAS;
+  }
+
+  public int getImporterMaxKVBatchBytes() {
+    return importerMaxKVBatchBytes;
+  }
+
+  public void setImporterMaxKVBatchBytes(int importerMaxKVBatchBytes) {
+    this.importerMaxKVBatchBytes = importerMaxKVBatchBytes;
+  }
+
+  public int getImporterMaxKVBatchSize() {
+    return importerMaxKVBatchSize;
+  }
+
+  public void setImporterMaxKVBatchSize(int importerMaxKVBatchSize) {
+    this.importerMaxKVBatchSize = importerMaxKVBatchSize;
+  }
+
+  public int getScatterWaitSeconds() {
+    return scatterWaitSeconds;
+  }
+
+  public void setScatterWaitSeconds(int scatterWaitSeconds) {
+    this.scatterWaitSeconds = scatterWaitSeconds;
+  }
+
+>>>>>>> 2eb77d6... [close #370] make gRPC and TiKV health check configurable (#369)
   public int getRawKVDefaultBackoffInMS() {
     return rawKVDefaultBackoffInMS;
   }
diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java
index 378c73ce3b3..a3819fb75b7 100644
--- a/src/test/java/org/tikv/common/TiConfigurationTest.java
+++ b/src/test/java/org/tikv/common/TiConfigurationTest.java
@@ -16,7 +16,14 @@
 package org.tikv.common;
 
 import static org.junit.Assert.assertEquals;
+<<<<<<< HEAD
+=======
+import static org.junit.Assert.assertFalse;
+import static org.tikv.common.ConfigUtils.TIKV_GRPC_HEALTH_CHECK_TIMEOUT;
+import static org.tikv.common.ConfigUtils.TIKV_HEALTH_CHECK_PERIOD_DURATION;
+>>>>>>> 2eb77d6... [close #370] make gRPC and TiKV health check configurable (#369)
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TiConfigurationTest {
@@ -28,6 +35,40 @@ public void configFileTest() {
   }
 
   @Test
+<<<<<<< HEAD
+=======
+  public void tiFlashDefaultValueTest() {
+    TiConfiguration conf = TiConfiguration.createRawDefault();
+    assertFalse(conf.isTiFlashEnabled());
+  }
+
+  @Test
+  public void testGrpcHealthCheckTimeoutValue() {
+    TiConfiguration conf = TiConfiguration.createDefault();
+    // default value
+    Assert.assertEquals(
+        TiConfiguration.getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT), conf.getGrpcHealthCheckTimeout());
+    // new value
+    int newValue = 100000;
+    conf.setGrpcHealthCheckTimeout(newValue);
+    Assert.assertEquals(newValue, conf.getGrpcHealthCheckTimeout());
+  }
+
+  @Test
+  public void testHealthCheckPeriodDurationValue() {
+    TiConfiguration conf = TiConfiguration.createDefault();
+    // default value
+    Assert.assertEquals(
+        TiConfiguration.getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION),
+        conf.getHealthCheckPeriodDuration());
+    // new value
+    int newValue = 100000;
+    conf.setHealthCheckPeriodDuration(newValue);
+    Assert.assertEquals(newValue, conf.getHealthCheckPeriodDuration());
+  }
+
+  @Test
+>>>>>>> 2eb77d6... [close #370] make gRPC and TiKV health check configurable (#369)
   public void testGrpcIdleTimeoutValue() {
     TiConfiguration conf = TiConfiguration.createDefault();
     // default value