diff --git a/src/main/java/io/vlingo/actors/BasicCompletes.java b/src/main/java/io/vlingo/actors/BasicCompletes.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/vlingo/actors/BasicCompletes.java
+++ b/src/main/java/io/vlingo/actors/BasicCompletes.java
@@ -121,6 +121,9 @@ public class BasicCompletes<T> implements Completes<T>, Scheduled {
       } catch (Exception e) {
         // ignore
       }
+      if (hasOutcome()) {
+        return outcome();
+      }
       if (timeout >= 0) {
         countDown -= 100;
         if (countDown <= 0) {
diff --git a/src/main/java/io/vlingo/actors/testkit/TestUntil.java b/src/main/java/io/vlingo/actors/testkit/TestUntil.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/vlingo/actors/testkit/TestUntil.java
+++ b/src/main/java/io/vlingo/actors/testkit/TestUntil.java
@@ -51,6 +51,9 @@ public final class TestUntil {
       } catch (Exception e) {
         // ignore
       }
+      if (latch.getCount() == 0) {
+        return true;
+      }
       if (timeout >= 0) {
         countDown -= 100;
         if (countDown <= 0) {
Fixed possible oversleep in await() and completesWithin().