diff --git a/src/test/java/com/box/sdk/EventStreamTest.java b/src/test/java/com/box/sdk/EventStreamTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/box/sdk/EventStreamTest.java
+++ b/src/test/java/com/box/sdk/EventStreamTest.java
@@ -57,8 +57,14 @@ public class EventStreamTest {
 
         boolean createdEventFound = false;
         boolean deletedEventFound = false;
-        while (!createdEventFound || !deletedEventFound) {
+        int timeouts = 0;
+        while ( timeouts < 3 && (!createdEventFound || !deletedEventFound)) {
             BoxEvent event = observedEvents.poll(1, TimeUnit.MINUTES);
+            if( null == event) {
+                timeouts++;
+                System.out.println("Time outs: " + timeouts);
+                continue;
+            }
             BoxResource.Info  sourceInfo = event.getSourceInfo();
             //  Some events may not have sourceInfo
             if (sourceInfo == null) {
Fix event stream to handle no events in the stream