diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java
index ec8d6802..13346248 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java
@@ -133,7 +133,7 @@ public class LazyFs {
         errPiper.start();
 
         try {
-            if (!startLatch.await(5, TimeUnit.SECONDS))
+            if (!startLatch.await(30, TimeUnit.SECONDS))
                 throw new RuntimeException("StartLatch timed out");
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java
index 6fa18d5e..3fdb5369 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java
@@ -180,8 +180,15 @@ public class LazyFsIT {
         waitingConsumer1 = new WaitingConsumer();
         var loggingConsumer1 = new Slf4jLogConsumer(LoggerFactory.getLogger(LazyFsIT.class)).withPrefix("1-" + testInfo.getDisplayName());
         container1.followOutput(loggingConsumer1.andThen(waitingConsumer1));
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+            waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            // LazyFs can crash too early
+            Assumptions.assumeTrue(false);
+        }
 
         executor.submit(() -> {
             try {
@@ -250,8 +257,16 @@ public class LazyFsIT {
         waitingConsumer1 = new WaitingConsumer();
         var loggingConsumer1 = new Slf4jLogConsumer(LoggerFactory.getLogger(LazyFsIT.class)).withPrefix("1-" + testInfo.getDisplayName());
         container1.followOutput(loggingConsumer1.andThen(waitingConsumer1));
-        waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
-        waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+        try {
+            waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+            waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
+            // LazyFs can crash too early
+
+            Assumptions.assumeTrue(false);
+        }
 
         executor.submit(() -> {
             try {
@@ -324,7 +339,10 @@ public class LazyFsIT {
             waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
             // LazyFs can crash too early
+
             Assumptions.assumeTrue(false);
         }
         var barrier2 = new CountDownLatch(1);
@@ -402,7 +420,10 @@ public class LazyFsIT {
             waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
             waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Connected"), 60, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
+            if (crashType.equals(CrashType.CRASH))
+                throw e;
             // LazyFs can crash too early
+
             Assumptions.assumeTrue(false);
         }