diff --git a/src/test/java/com/rabbitmq/stream/Host.java b/src/test/java/com/rabbitmq/stream/Host.java
index bb771cfcc6..457d2a9832 100644
--- a/src/test/java/com/rabbitmq/stream/Host.java
+++ b/src/test/java/com/rabbitmq/stream/Host.java
@@ -98,9 +98,9 @@ public static Process killConnection(String connectionName) throws IOException {
 
   public static Process killStreamLeaderProcess(String stream) throws IOException {
     return rabbitmqctl(
-        "eval 'exit(rabbit_stream_manager:lookup_leader(<<\"/\">>, <<\""
+        "eval 'case rabbit_stream_manager:lookup_leader(<<\"/\">>, <<\""
             + stream
-            + "\">>),kill).'");
+            + "\">>) of {ok, Pid} -> exit(Pid, kill); Pid -> exit(Pid, kill) end.'");
   }
 
   public static String rabbitmqctlCommand() {
diff --git a/src/test/java/com/rabbitmq/stream/impl/TestUtils.java b/src/test/java/com/rabbitmq/stream/impl/TestUtils.java
index 178a86a004..658d44c9ff 100644
--- a/src/test/java/com/rabbitmq/stream/impl/TestUtils.java
+++ b/src/test/java/com/rabbitmq/stream/impl/TestUtils.java
@@ -193,7 +193,7 @@ public void accept(Object o) {
         try {
           task.run(o);
         } catch (Exception e) {
-          throw new RuntimeException();
+          throw new RuntimeException(e);
         }
       }