diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
index 781c783b3b368..cc44c19008543 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
@@ -31,16 +31,13 @@ public class DurationRoutePolicyFactoryTest extends ContextTestSupport {
 
     @Test
     public void testDurationRoutePolicyFactory() throws Exception {
-        assertTrue(context.getRouteController().getRouteStatus("foo").isStarted());
-        assertFalse(context.getRouteController().getRouteStatus("foo").isStopped());
-
         // the policy should stop the route after 2 seconds which is approx
         // 20-30 messages
         getMockEndpoint("mock:foo").expectedMinimumMessageCount(10);
         assertMockEndpointsSatisfied();
 
-        // need a little time to stop async
-        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+        // need some time to stop async
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
             assertFalse(context.getRouteController().getRouteStatus("foo").isStarted());
             assertTrue(context.getRouteController().getRouteStatus("foo").isStopped());
         });
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageEndpointExceptionIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageEndpointExceptionIssueTest.java
index 299b756f557b1..2d449c5703bfe 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageEndpointExceptionIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageEndpointExceptionIssueTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.issues;
 
-import java.util.concurrent.TimeUnit;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -44,7 +42,7 @@ public void testRecipientListUseOriginalMessageIssue() throws Exception {
         template.sendBodyAndHeader(fileUri("inbox"), "A",
                 Exchange.FILE_NAME, "hello.txt");
 
-        assertMockEndpointsSatisfied(100, TimeUnit.MILLISECONDS);
+        assertMockEndpointsSatisfied();
     }
 
     @Override
@@ -55,7 +53,7 @@ public void configure() {
                 onException(Exception.class).handled(true).useOriginalMessage().to(fileUri("outbox"))
                         .to("mock:error");
 
-                from(fileUri("inbox?initialDelay=0&delay=10"))
+                from(fileUri("inbox?initialDelay=100&delay=10"))
                         .transform(constant("B"))
                         .setHeader("path", constant("mock:throwException"))
                         // must enable share uow to let the onException use