diff --git a/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java b/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
index e4846fdec2..7d9189ff33 100644
--- a/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
+++ b/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
@@ -200,7 +200,7 @@ public class ApacheHttpClientTest extends AndroidTestCase {
         }
 
         public boolean waitForStateChange() throws InterruptedException {
-            return hasExpectedState() || mReceiveLatch.await(30, TimeUnit.SECONDS);
+            return mReceiveLatch.await(30, TimeUnit.SECONDS) || hasExpectedState();
         }
 
         private boolean hasExpectedState() {