diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 8b43066fe7..b7a5b3fe03 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -233,6 +233,13 @@
+
+ org.apache.hive
+ hive-common
+ ${project.version}
+ test-jar
+ test
+
org.apache.hive
hive-standalone-metastore
diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java
index 19f804882a..068aad4f19 100644
--- a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java
+++ b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java
@@ -25,8 +25,10 @@
import org.apache.hadoop.hive.llap.daemon.impl.QueryIdentifier;
import org.apache.hadoop.hive.llap.protocol.LlapTaskUmbilicalProtocol;
import org.apache.hadoop.io.Text;
+import org.apache.hive.common.util.RetryTestRunner;
import org.apache.tez.dag.records.TezTaskAttemptID;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -44,6 +46,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(RetryTestRunner.class)
public class TestAMReporter {
@Test(timeout = 5000)
public void testMultipleAM() throws InterruptedException {