diff --git a/artio-binary-entrypoint-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/AbstractBinaryEntryPointSystemTest.java b/artio-binary-entrypoint-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/AbstractBinaryEntryPointSystemTest.java
index 1ee226220c..92ca0761a2 100644
--- a/artio-binary-entrypoint-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/AbstractBinaryEntryPointSystemTest.java
+++ b/artio-binary-entrypoint-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/AbstractBinaryEntryPointSystemTest.java
@@ -90,7 +90,7 @@ public void evaluate() throws Throwable
             };
         }
     };
-    public static final long LONG_TEST_TIMEOUT_IN_MS = 20_000L;
+    public static final long LONG_TEST_TIMEOUT_IN_MS = 50_000L;
 
     static final int AWAIT_TIMEOUT_IN_MS = 10_000;
     static final int TIMEOUT_EPSILON_IN_MS = 10;
diff --git a/artio-core/src/test/java/uk/co/real_logic/artio/Timing.java b/artio-core/src/test/java/uk/co/real_logic/artio/Timing.java
index bc9ffc7fdf..c3816e99b7 100644
--- a/artio-core/src/test/java/uk/co/real_logic/artio/Timing.java
+++ b/artio-core/src/test/java/uk/co/real_logic/artio/Timing.java
@@ -28,7 +28,7 @@
 public final class Timing
 {
     // Long timeout, but one that doesn't cause long overflow.
-    public static final long DEFAULT_TIMEOUT_IN_MS = isDebuggerAttached() ? Integer.MAX_VALUE : 20_000;
+    public static final long DEFAULT_TIMEOUT_IN_MS = isDebuggerAttached() ? Integer.MAX_VALUE : 49_000;
 
     public static <T> T withTimeout(final String message, final Supplier<Optional<T>> supplier, final long timeoutInMs)
     {
diff --git a/artio-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/SystemTestUtil.java b/artio-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/SystemTestUtil.java
index 7943785e3c..cd330941ba 100644
--- a/artio-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/SystemTestUtil.java
+++ b/artio-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/SystemTestUtil.java
@@ -81,7 +81,7 @@ public final class SystemTestUtil
     static final String INITIATOR_ID2 = "initiator2";
     static final String INITIATOR_ID3 = "initiator3";
     public static final String CLIENT_LOGS = "client-logs";
-    static final long TIMEOUT_IN_MS = 100;
+    static final long TIMEOUT_IN_MS = 1000;
     static final long AWAIT_TIMEOUT_IN_MS = 50 * TIMEOUT_IN_MS;
     static final int LIBRARY_LIMIT = 2;