diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
index b54e96d213a01..4bd8ca970e525 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
@@ -168,11 +168,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java
index 681487fceee54..2cc59ed664266 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java
@@ -28,13 +28,13 @@
 import java.util.Set;
 
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.NotAcceptableException;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.ServiceUnavailableException;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
 import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -231,15 +231,15 @@ public void testInvalidUri2() throws JSONException, Exception {
 
   @Test
   public void testInvalidAccept() throws JSONException, Exception {
-    WebTarget r = targetWithJsonObject();
+    WebTarget r = target();
     String responseStr = "";
     try {
       responseStr = r.path("ws").path("v1").path("mapreduce")
           .request(MediaType.TEXT_PLAIN).get(String.class);
       fail("should have thrown exception on invalid uri");
-    } catch (NotAcceptableException sue) {
+    } catch (ServiceUnavailableException sue) {
       Response response = sue.getResponse();
-      assertResponseStatusCode(NOT_ACCEPTABLE, response.getStatusInfo());
+      assertResponseStatusCode(SERVICE_UNAVAILABLE, response.getStatusInfo());
       WebServicesTestUtils.checkStringMatch(
           "error string exists and shouldn't", "", responseStr);
     }
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index 81457e6845ec3..ef424e3e992ee 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
@@ -92,11 +92,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
index 57f954ecd3841..d8c9eaf19bb20 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
@@ -115,11 +115,6 @@
           <artifactId>junit-platform-launcher</artifactId>
           <scope>test</scope>
       </dependency>
-      <dependency>
-          <groupId>org.junit.vintage</groupId>
-          <artifactId>junit-vintage-engine</artifactId>
-          <scope>test</scope>
-      </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java
index b320868242e29..c34df08b7ff7c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java
@@ -20,14 +20,13 @@
 
 import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import java.io.StringReader;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.NotAcceptableException;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.ServiceUnavailableException;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
@@ -233,12 +232,12 @@ public void testInvalidAccept() throws JSONException, Exception {
     WebTarget r = target();
     String responseStr = "";
     try {
-      responseStr = r.path("ws").path("v1").path("history").
-          request(MediaType.TEXT_PLAIN).get(String.class);
-      fail("should have thrown exception on invalid uri");
-    } catch (NotAcceptableException ue) {
+      Response response =
+          r.path("ws").path("v1").path("history").request(MediaType.TEXT_PLAIN).get();
+      throw new ServiceUnavailableException(response);
+    } catch (ServiceUnavailableException ue) {
       Response response = ue.getResponse();
-      assertResponseStatusCode(Response.Status.NOT_ACCEPTABLE,
+      assertResponseStatusCode(Response.Status.SERVICE_UNAVAILABLE,
           response.getStatusInfo());
       WebServicesTestUtils.checkStringMatch(
           "error string exists and shouldn't", "", responseStr);
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
index b5deed6231e32..8305867ba0827 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
@@ -148,11 +148,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
index f162b7037ee59..5ffa4f52b3080 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
@@ -80,11 +80,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
index b1c1b51c81fc9..fee97311ee589 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
@@ -66,11 +66,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/ApplicationEntity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/ApplicationEntity.java
index 58f65f34e1f1f..20226aa8e9c68 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/ApplicationEntity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/ApplicationEntity.java
@@ -43,12 +43,7 @@ public ApplicationEntity(TimelineEntity entity) {
   }
 
   public String getQueue() {
-    if (getInfo() != null) {
-      if (getInfo().containsKey(QUEUE_INFO_KEY)) {
-        return getInfo().get(QUEUE_INFO_KEY).toString();
-      }
-    }
-    return "";
+    return getInfo().get(QUEUE_INFO_KEY).toString();
   }
 
   public void setQueue(String queue) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
index 493f89d1350dc..d38934828adb6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
@@ -182,11 +182,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
index 317964557f883..6abd8f45ca874 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
@@ -289,11 +289,7 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
index c88256e7da2b0..377a0fbf459b7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
@@ -191,11 +191,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
index 7c9dbaeaf368f..fff27bd008471 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
@@ -92,7 +92,7 @@
  * Test application master client class to resource manager.
  */
 @RunWith(value = Parameterized.class)
-public class TestAMRMClient extends BaseAMRMClientTest {
+public class TestAMRMClient extends BaseAMRMClientTest{
 
   private final static int DEFAULT_ITERATION = 3;
 
@@ -123,10 +123,6 @@ public void testAMRMClientNoMatchingRequests()
     List<? extends Collection<ContainerRequest>> matches =
         amClient.getMatchingRequests(priority, node, testCapability1);
     assertEquals("Expected no matching requests.", matches.size(), 0);
-    amClient.close();
-    if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
-      amClient.stop();
-    }
   }
   
   @Test (timeout=60000)
@@ -261,7 +257,6 @@ public void testAMRMClientMatchingFit() throws YarnException, IOException {
           null, null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -395,7 +390,6 @@ public void testAMRMClientMatchingFitExecType()
           null, null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -450,7 +444,6 @@ public void testAMRMClientMatchingFitInferredRack()
               null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -567,20 +560,18 @@ public void testAMRMClientMatchStorage() throws YarnException, IOException {
         }
       }
       
-      assertTrue(allocatedContainerCount <= 2);
+      assertEquals(2, allocatedContainerCount);
       AllocateResponse allocResponse = amClient.allocate(0.1f);
       assertEquals(0, amClient.release.size());
       assertEquals(0, amClient.ask.size());
-      assertTrue(allocResponse.getAllocatedContainers().size() >= 0);
-
+      assertEquals(0, allocResponse.getAllocatedContainers().size());
       // 0 requests left. everything got cleaned up
-      // assertTrue(remoteRequestsTable.isEmpty());
+      assertTrue(remoteRequestsTable.isEmpty());
       
       amClient.unregisterApplicationMaster(FinalApplicationStatus.SUCCEEDED,
           null, null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -646,7 +637,7 @@ public void testAllocationWithBlacklist() throws YarnException, IOException {
       amClient.addContainerRequest(storedContainer2);
       allocatedContainerCount = getAllocatedContainersNumber(amClient,
           DEFAULT_ITERATION);
-      assertTrue(allocatedContainerCount <= 2);
+      assertEquals(2, allocatedContainerCount);
       
       // Test in case exception in allocate(), blacklist is kept
       assertTrue(amClient.blacklistAdditions.isEmpty());
@@ -666,7 +657,6 @@ public void testAllocationWithBlacklist() throws YarnException, IOException {
         assertEquals(1, amClient.blacklistAdditions.size());
       }
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -719,7 +709,6 @@ public void testAMRMClientWithBlacklist() throws YarnException, IOException {
       assertEquals(2, amClient.blacklistAdditions.size());
       assertEquals(1, amClient.blacklistRemovals.size());
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -748,13 +737,13 @@ private int getAllocatedContainersNumber(
     return allocatedContainerCount;
   }
 
-  @Test (timeout=90000)
-  public void testAMRMClient() throws YarnException, IOException, InterruptedException, TimeoutException {
+  @Test (timeout=60000)
+  public void testAMRMClient() throws YarnException, IOException {
     initAMRMClientAndTest(false);
   }
 
   @Test (timeout=60000)
-  public void testAMRMClientAllocReqId() throws Exception {
+  public void testAMRMClientAllocReqId() throws YarnException, IOException {
     initAMRMClientAndTest(true);
   }
 
@@ -770,7 +759,7 @@ public void testAMRMClientWithSaslEncryption() throws Exception {
   }
 
   protected void initAMRMClientAndTest(boolean useAllocReqId)
-      throws YarnException, IOException, InterruptedException, TimeoutException {
+      throws YarnException, IOException {
     AMRMClient<ContainerRequest> amClient = null;
     try {
       // start am rm client
@@ -788,16 +777,15 @@ protected void initAMRMClientAndTest(boolean useAllocReqId)
       amClient.registerApplicationMaster("Host", 10000, "");
 
       if (useAllocReqId) {
-        testAllocRequestId((AMRMClientImpl<ContainerRequest>) amClient);
+        testAllocRequestId((AMRMClientImpl<ContainerRequest>)amClient);
       } else {
         testAllocation((AMRMClientImpl<ContainerRequest>) amClient);
       }
 
       amClient.unregisterApplicationMaster(FinalApplicationStatus.SUCCEEDED,
-      null, null);
+          null, null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -805,7 +793,7 @@ protected void initAMRMClientAndTest(boolean useAllocReqId)
   }
   
   @Test(timeout=30000)
-  public void testAskWithNodeLabels() throws IOException {
+  public void testAskWithNodeLabels() {
     AMRMClientImpl<ContainerRequest> client =
         new AMRMClientImpl<ContainerRequest>();
 
@@ -850,11 +838,6 @@ public void testAskWithNodeLabels() throws IOException {
         Assert.assertNull(req.getNodeLabelExpression());
       }
     }
-
-    client.close();
-    if (client != null && client.getServiceState() == STATE.STARTED) {
-      client.stop();
-    }
   }
   
   private void verifyAddRequestFailed(AMRMClient<ContainerRequest> client,
@@ -868,7 +851,7 @@ private void verifyAddRequestFailed(AMRMClient<ContainerRequest> client,
   }
   
   @Test(timeout=30000)
-  public void testAskWithInvalidNodeLabels() throws IOException {
+  public void testAskWithInvalidNodeLabels() {
     AMRMClientImpl<ContainerRequest> client =
         new AMRMClientImpl<ContainerRequest>();
 
@@ -876,11 +859,6 @@ public void testAskWithInvalidNodeLabels() throws IOException {
     verifyAddRequestFailed(client,
         new ContainerRequest(Resource.newInstance(1024, 1), null, null,
             Priority.UNDEFINED, true, "x && y"));
-
-    client.close();
-    if (client != null && client.getServiceState() == STATE.STARTED) {
-      client.stop();
-    }
   }
 
   @Test(timeout=60000)
@@ -919,7 +897,6 @@ public void testAMRMClientWithContainerResourceChange()
       amClient.unregisterApplicationMaster(FinalApplicationStatus.SUCCEEDED,
           null, null);
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -934,21 +911,13 @@ private List<Container> allocateAndStartContainers(
       amClient.addContainerRequest(
           new ContainerRequest(capability, nodes, racks, priority));
     }
-    int iterationsLeft = 15;
-    int allocatedContainerCount = 0;
-    List<Container> containers = new ArrayList<>();
-    while (allocatedContainerCount <= num && iterationsLeft-- > 0) {
-      AllocateResponse allocResponse = amClient.allocate(0.1f);
-      allocatedContainerCount += allocResponse.getAllocatedContainers().size();
-      for (Container container : allocResponse.getAllocatedContainers()) {
-        containers.add(container);
-      }
-      if (iterationsLeft > 0) {
-        // let NM heartbeat to RM and trigger allocations
-        triggerSchedulingWithNMHeartBeat();
-      }
-    }
-
+    // send allocation requests
+    amClient.allocate(0.1f);
+    // let NM heartbeat to RM and trigger allocations
+    triggerSchedulingWithNMHeartBeat();
+    // get allocations
+    AllocateResponse allocResponse = amClient.allocate(0.1f);
+    List<Container> containers = allocResponse.getAllocatedContainers();
     assertEquals(num, containers.size());
 
     // build container launch context
@@ -1139,10 +1108,6 @@ public void testAMRMContainerPromotionAndDemotionWithAutoUpdate()
     waitForNMContextUpdate(updatedContainer, ExecutionType.OPPORTUNISTIC);
 
     amClient.close();
-
-    if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
-      amClient.stop();
-    }
   }
 
   private AllocateResponse waitForAllocation(AMRMClient amrmClient,
@@ -1557,7 +1522,7 @@ private void testAllocation(final AMRMClientImpl<ContainerRequest> amClient)
 
     // RM should allocate container within 2 calls to allocate()
     int allocatedContainerCount = 0;
-    int iterationsLeft = 15;
+    int iterationsLeft = 3;
     Set<ContainerId> releases = new TreeSet<ContainerId>();
     
     amClient.getNMTokenCache().clearCache();
@@ -1596,8 +1561,8 @@ private void testAllocation(final AMRMClientImpl<ContainerRequest> amClient)
     assertTrue(receivedNMTokens.size() > 0
         && receivedNMTokens.size() <= nodeCount);
     
-    assertTrue(allocatedContainerCount <= containersRequestedAny);
-    assertTrue(releases.size() <= 2);
+    assertEquals(allocatedContainerCount, containersRequestedAny);
+    assertEquals(2, releases.size());
     assertEquals(0, amClient.ask.size());
     
     // need to tell the AMRMClient that we dont need these resources anymore
@@ -1640,14 +1605,14 @@ public AllocateResponse answer(InvocationOnMock invocation)
       amClient.rmClient = realRM;
     }
 
-    assertTrue(amClient.release.size() <= 2);
+    assertEquals(2, amClient.release.size());
     assertEquals(3, amClient.ask.size());
     snoopRequest = amClient.ask.iterator().next();
     // verify that the remove request made in between makeRequest and allocate 
     // has not been lost
     assertEquals(0, snoopRequest.getNumContainers());
 
-    // waitForContainerCompletion(15, amClient, releases);
+    waitForContainerCompletion(3, amClient, releases);
   }
 
   private void waitForContainerCompletion(int numIterations,
@@ -1658,7 +1623,7 @@ private void waitForContainerCompletion(int numIterations,
       // inform RM of rejection
       AllocateResponse allocResponse = amClient.allocate(0.1f);
       // RM did not send new containers because AM does not need any
-      // assertEquals(0, allocResponse.getAllocatedContainers().size());
+      assertEquals(0, allocResponse.getAllocatedContainers().size());
       if(allocResponse.getCompletedContainersStatuses().size() > 0) {
         for(ContainerStatus cStatus :allocResponse
             .getCompletedContainersStatuses()) {
@@ -1669,7 +1634,7 @@ private void waitForContainerCompletion(int numIterations,
           }
         }
       }
-      if (numIterations > 0) {
+      if(numIterations > 0) {
         // let NM heartbeat to RM and trigger allocations
         triggerSchedulingWithNMHeartBeat();
       }
@@ -1680,7 +1645,7 @@ private void waitForContainerCompletion(int numIterations,
 
   private void testAllocRequestId(
       final AMRMClientImpl<ContainerRequest> amClient) throws YarnException,
-          IOException, InterruptedException, TimeoutException {
+      IOException {
     // setup container request
 
     assertEquals(0, amClient.ask.size());
@@ -1734,19 +1699,18 @@ private void testAllocRequestId(
       }
     }
 
-    assertTrue(allocatedContainers.size() <= containersRequestedAny);
+    assertEquals(containersRequestedAny, allocatedContainers.size());
     Set<Long> expAllocIds = new HashSet<>(
         Arrays.asList(Long.valueOf(0), Long.valueOf(1), Long.valueOf(2)));
     Set<Long> actAllocIds = new HashSet<>();
     for (Container ac : allocatedContainers) {
       actAllocIds.add(Long.valueOf(ac.getAllocationRequestId()));
     }
-
-    assertTrue(expAllocIds.containsAll(actAllocIds));
-    assertTrue(releases.size() <= 3);
+    assertEquals(expAllocIds, actAllocIds);
+    assertEquals(3, amClient.release.size());
     assertEquals(0, amClient.ask.size());
 
-    // waitForContainerCompletion(15, amClient, releases);
+    waitForContainerCompletion(3, amClient, releases);
   }
 
   private void assertNumContainers(AMRMClientImpl<ContainerRequest> amClient,
@@ -1785,7 +1749,7 @@ public Boolean get() {
   };
 
   @Test
-  public void testWaitFor() throws InterruptedException, IOException {
+  public void testWaitFor() throws InterruptedException {
     AMRMClientImpl<ContainerRequest> amClient = null;
     CountDownSupplier countDownChecker = new CountDownSupplier();
 
@@ -1799,7 +1763,6 @@ public void testWaitFor() throws InterruptedException, IOException {
       amClient.waitFor(countDownChecker, 1000);
       assertEquals(3, countDownChecker.counter);
     } finally {
-      amClient.close();
       if (amClient != null) {
         amClient.stop();
       }
@@ -1933,7 +1896,6 @@ public ApplicationMasterProtocol run() {
         null, null);
 
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
@@ -2042,7 +2004,6 @@ public void testGetMatchingFitWithProfiles() throws Exception {
       matches = amClient.getMatchingRequests(priority, node, testCapability4);
       assertEquals(1, matches.size());
     } finally {
-      amClient.close();
       if (amClient != null && amClient.getServiceState() == STATE.STARTED) {
         amClient.stop();
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index c409403c84f08..bd5869fa3a2c6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -195,11 +195,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/amrmproxy/TestLocalityMulticastAMRMProxyPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/amrmproxy/TestLocalityMulticastAMRMProxyPolicy.java
index 4172c6afb94f5..d7102e03e738f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/amrmproxy/TestLocalityMulticastAMRMProxyPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/policies/amrmproxy/TestLocalityMulticastAMRMProxyPolicy.java
@@ -197,7 +197,7 @@ public void testSplitBasedOnHeadroom() throws Exception {
     checkTotalContainerAllocation(response, 100);
   }
 
-  @Test(timeout = 8000)
+  @Test(timeout = 5000)
   public void testStressPolicy() throws Exception {
 
     // Tests how the headroom info are used to split based on the capacity
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
index 9e624835fda61..3d0d24320de60 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
@@ -149,11 +149,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
index 3854123b2693a..ed44f3171d8ed 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
@@ -300,8 +300,7 @@ public void startWepApp() {
     LOG.info("Instantiating GPGWebApp at {}.", webAppAddress);
     GPGWebApp gpgWebApp = new GPGWebApp(this);
     webApp = WebApps.$for("gpg", GPGContext.class, this.gpgContext,
-        "gpg-ws").at(webAppAddress).
-         withResourceConfig(gpgWebApp.resourceConfig()).start(gpgWebApp);
+        "ws").at(webAppAddress).withResourceConfig(gpgWebApp.resourceConfig()).start(gpgWebApp);
   }
 
   @SuppressWarnings("resource")
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
index 52a523debfbc5..1dd808c9ec699 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
@@ -17,7 +17,6 @@
 */
 package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
 import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver;
 import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
@@ -60,7 +59,6 @@ private class JerseyBinder extends AbstractBinder {
     @Override
     protected void configure() {
       bind(gpg).to(GlobalPolicyGenerator.class).named("gpg");
-      bind(gpg.getConfig()).to(Configuration.class).named("conf");
     }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index df87a7b18efff..cfb1e95bd6011 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -104,11 +104,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
index 365ae8cd30501..f307a0b509890 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
@@ -356,11 +356,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
index 31cdd092c0ab2..f47ca4eb94793 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppFilter.java
@@ -250,7 +250,6 @@ private String ahsRedirectPath(String uri, RMWebApp rmWebApp) {
 
   private boolean shouldRedirect(RMWebApp rmWebApp, String uri) {
     return !uri.equals("/" + rmWebApp.wsName() + "/v1/cluster/info")
-        && !uri.equals("/ws/v1/cluster/info")
         && !uri.equals("/" + rmWebApp.name() + "/cluster")
         && !uri.startsWith(ProxyUriUtils.PROXY_BASE)
         && !NON_REDIRECTED_URIS.contains(uri);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
index 2df7c08d104cb..ffdd4ed0b6062 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
@@ -183,11 +183,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index a2b68722ca1ac..025bc3f139ed6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -131,11 +131,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <!-- 'mvn dependency:analyze' fails to detect use of this direct
          dependency -->