diff --git a/Testing/build.xml b/Testing/build.xml
index f8eff4b821..eea244f7ef 100644
--- a/Testing/build.xml
+++ b/Testing/build.xml
@@ -80,6 +80,8 @@
                 <sysproperty key="crPort" value="${crPort}"/>
                 <sysproperty key="crUserName" value="${crUserName}"/>
                 <sysproperty key="crPassword" value="${crPassword}"/>
+                <sysproperty key="zooKeeperHost" value="${zooKeeperHost}"/>
+                <sysproperty key="zooKeeperPort" value="${zooKeeperPort}"/>
                 <sysproperty key="isMultiUser" value="${isMultiUser}"/>
                 <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
                 <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>
diff --git a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
index 20e82d96e7..de8cf07fc8 100644
--- a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
+++ b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2020 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -463,6 +463,9 @@ public class AutopsyTestCases {
         } catch (UserPreferencesException ex) {
             logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS
         }
+        
+        UserPreferences.setZkServerHost(System.getProperty("zooKeeperHost"));
+        UserPreferences.setZkServerPort(System.getProperty("zooKeeperPort"));
     }
 
     private void expandNodes(JTreeOperator jto, TreePath tp) {
diff --git a/test/script/regression.py b/test/script/regression.py
index 94b50c244f..e1616cc550 100644
--- a/test/script/regression.py
+++ b/test/script/regression.py
@@ -475,6 +475,8 @@ class TestRunner(object):
         test_data.ant.append("-DcrPort=" + str(test_config.crPort))
         test_data.ant.append("-DcrUserName=" + str(test_config.crUserName))
         test_data.ant.append("-DcrPassword=" + str(test_config.crPassword))
+        test_data.ant.append("-DzooKeeperHost=" + str(test_config.zooKeeperHost))
+        test_data.ant.append("-DzooKeeperPort=" + str(test_config.zooKeeperPort))
         if test_data.isMultiUser:
             test_data.ant.append("-DisMultiUser=true")
         # Note: test_data has autopys_version attribute, but we couldn't see it from here. It's set after run ingest.
@@ -866,6 +868,10 @@ class TestConfiguration(object):
                 self.crUserName = parsed_config.getElementsByTagName("crUserName")[0].getAttribute("value").encode().decode("utf_8")
             if parsed_config.getElementsByTagName("crPassword"):
                 self.crPassword = parsed_config.getElementsByTagName("crPassword")[0].getAttribute("value").encode().decode("utf_8")
+            if parsed_config.getElementsByTagName("zooKeeperHost"):
+                self.zooKeeperHost = parsed_config.getElementsByTagName("zooKeeperHost")[0].getAttribute("value").encode().decode("utf_8")
+            if parsed_config.getElementsByTagName("zooKeeperPort"):
+                self.zooKeeperPort = parsed_config.getElementsByTagName("zooKeeperPort")[0].getAttribute("value").encode().decode("utf_8")
             self._init_imgs(parsed_config)
             self._init_build_info(parsed_config)