diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
index 17c01b54fb..2ed5d967ee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
@@ -334,7 +334,7 @@ private static void loadData() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, entity.getId(), te);
       hbi.write(cluster, user, flow, flowVersion, runid, entity1.getId(), te1);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java
index 5cbb78145d..0938e9e227 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java
@@ -182,7 +182,7 @@ static void loadApps(HBaseTestingUtility util) throws IOException {
     te2.addEntity(entity2);
     HBaseTimelineWriterImpl hbi = null;
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(util.getConfiguration());
       hbi.init(util.getConfiguration());
       hbi.start();
       String cluster = "cluster1";
@@ -360,7 +360,7 @@ static void loadEntities(HBaseTestingUtility util) throws IOException {
     te.addEntity(entity2);
     HBaseTimelineWriterImpl hbi = null;
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(util.getConfiguration());
       hbi.init(util.getConfiguration());
       hbi.start();
       String cluster = "cluster1";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
index b3e5197ddf..e70198a34f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
@@ -155,7 +155,7 @@ public void testWriteNullApplicationToHBase() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "cluster_check_null_application";
@@ -275,7 +275,7 @@ public void testWriteApplicationToHBase() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "cluster_test_write_app";
@@ -502,7 +502,7 @@ public void testEvents() throws IOException {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "cluster_test_events";
@@ -620,7 +620,7 @@ public void testNonIntegralMetricValues() throws IOException {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       // Writing application entity.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
index 4b4c3e1733..3076709e24 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
@@ -194,7 +194,7 @@ public void testWriteEntityToHBase() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "cluster_test_write_entity";
@@ -391,7 +391,7 @@ public void testEventsWithEmptyInfo() throws IOException {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "cluster_test_empty_eventkey";
@@ -496,7 +496,7 @@ public void testEventsEscapeTs() throws IOException {
     HBaseTimelineWriterImpl hbi = null;
     try {
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.start();
       String cluster = "clus!ter_\ttest_ev  ents";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java
index 3ddb230f30..1906574b8c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java
@@ -119,7 +119,7 @@ public void testWriteFlowRunMinMax() throws Exception {
         .getEntityMinStartTime(minStartTs);
 
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
 
@@ -228,7 +228,7 @@ public void testWriteFlowActivityOneFlow() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       String appName = "application_1111999999_1234";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -341,7 +341,7 @@ public void testFlowActivityTableOneFlowMultipleRunIds() throws IOException {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       String appName = "application_11888888888_1111";
       hbi.write(cluster, user, flow, flowVersion1, runid1, appName, te);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java
index 377611fcf9..74b9e501ca 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java
@@ -184,7 +184,7 @@ public void testWriteFlowRunMinMax() throws Exception {
         .getEntityMinStartTime(minStartTs);
 
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
 
@@ -290,7 +290,7 @@ public void testWriteFlowRunMetricsOneFlow() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -559,7 +559,7 @@ public void testWriteFlowRunMetricsPrefix() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, 1002345678919L, appName, te);
@@ -644,7 +644,7 @@ public void testWriteFlowRunsMetricFields() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -737,7 +737,7 @@ public void testWriteFlowRunFlush() throws Exception {
     TimelineEntity entityApp1 = null;
     TimelineEntity entityApp2 = null;
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
 
       for (int i = start; i < count; i++) {
@@ -826,7 +826,7 @@ public void testFilterFlowRunsByCreatedTime() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
           "application_11111111111111_1111", te);
@@ -908,7 +908,7 @@ public void testMetricFilters() throws Exception {
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
           "application_11111111111111_1111", te);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java
index 756d57bd32..30940886f3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java
@@ -287,7 +287,7 @@ public void testWriteFlowRunCompaction() throws Exception {
     TimelineEntities te1 = null;
     TimelineEntity entityApp1 = null;
     try {
-      hbi = new HBaseTimelineWriterImpl();
+      hbi = new HBaseTimelineWriterImpl(c1);
       hbi.init(c1);
       // now insert count * ( 100 + 100) metrics
       // each call to getEntityMetricsApp1 brings back 100 values
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index b94b85fa31..3511a2f4a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -101,6 +101,11 @@ public HBaseTimelineWriterImpl() {
     super(HBaseTimelineWriterImpl.class.getName());
   }
 
+  public HBaseTimelineWriterImpl(Configuration conf) throws IOException {
+    super(conf.get("yarn.application.id",
+        HBaseTimelineWriterImpl.class.getName()));
+  }
+
   /**
    * initializes the hbase connection to write to the entity table.
    */