1 files changed, 2 insertions, 1 deletions
diff --git a/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
index 7f7965f82eb..e10404cf2c7 100644
--- a/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
+++ b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
@@ -3,8 +3,8 @@ package com.yahoo.vespa.zookeeper.cli;
 
 import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 import org.apache.zookeeper.ZooKeeperMain;
+import org.apache.zookeeper.util.ServiceUtils;
 import org.slf4j.impl.SimpleLogger;
-
 import java.io.IOException;
 
 /**
@@ -20,6 +20,7 @@ public class Main {
         new ZkClientConfigBuilder()
                 .toConfigProperties()
                 .forEach(System::setProperty);
+        ServiceUtils.setSystemExitProcedure(System::exit);
         ZooKeeperMain.main(args);
     }
 }