diff --git a/heron/config/src/yaml/conf/kubernetes/statemgr.yaml b/heron/config/src/yaml/conf/kubernetes/statemgr.yaml
index df1c05752f1..25f2a45f653 100644
--- a/heron/config/src/yaml/conf/kubernetes/statemgr.yaml
+++ b/heron/config/src/yaml/conf/kubernetes/statemgr.yaml
@@ -19,7 +19,7 @@
 heron.class.state.manager: org.apache.heron.statemgr.zookeeper.curator.CuratorStateManager
 
 # local state manager connection string
-heron.statemgr.connection.string:  <zookeeper_host:zookeeper_port>
+heron.statemgr.connection.string:  127.0.0.1:2181
 
 # path of the root address to store the state in a local file system
 heron.statemgr.root.path: "/heron"
diff --git a/integration_test/src/python/test_runner/main.py b/integration_test/src/python/test_runner/main.py
index 732a154c419..2549fc7f131 100644
--- a/integration_test/src/python/test_runner/main.py
+++ b/integration_test/src/python/test_runner/main.py
@@ -20,10 +20,10 @@
 import logging
 import os
 import pkgutil
+import random
 import re
 import sys
 import time
-import uuid
 from http.client import HTTPConnection
 from threading import Lock, Thread
 
@@ -306,6 +306,7 @@ def run_tests(conf, test_args):
   ''' Run the test for each topology specified in the conf file '''
   lock = Lock()
   timestamp = time.strftime('%Y%m%d%H%M%S')
+  run_fingerprint = f"{timestamp}-{random.randint(0, 2**16):04x}"
 
   http_server_host_port = f"{test_args.http_server_hostname}:{test_args.http_server_port}"
 
diff --git a/integration_test/src/python/topology_test_runner/main.py b/integration_test/src/python/topology_test_runner/main.py
index 30e9f450e8b..72722b45a82 100644
--- a/integration_test/src/python/topology_test_runner/main.py
+++ b/integration_test/src/python/topology_test_runner/main.py
@@ -20,10 +20,10 @@
 import logging
 import os
 import pkgutil
+import random
 import re
 import sys
 import time
-import uuid
 from http.client import HTTPConnection
 from threading import Lock, Thread
 
@@ -255,6 +255,8 @@ def __init__(self, topology_name, cluster):
     self.state_mgr.start()
 
   def _load_state_mgr(self, cluster):
+    # this should use cli_config_path (after expanding HOME, or changing default to use ~ instead of $HOME)
+    # that way can have test copy of config
     state_mgr_config = configloader.load_state_manager_locations(cluster, os.getenv("HOME")
                                                                  +'/.heron/conf/'+cluster
                                                                  + '/statemgr.yaml')
@@ -481,6 +483,7 @@ def run_topology_tests(conf, test_args):
   """
   lock = Lock()
   timestamp = time.strftime('%Y%m%d%H%M%S')
+  run_fingerprint = f"{timestamp}-{random.randint(0, 2**16):04x}"
 
   http_server_host_port = f"{test_args.http_hostname}:{test_args.http_port}"
 
diff --git a/scripts/release/docker-images b/scripts/release/docker-images
index 3eea961bbc0..21f29f881ec 100755
--- a/scripts/release/docker-images
+++ b/scripts/release/docker-images
@@ -84,7 +84,8 @@ def build_dockerfile(
     log_run([str(BUILD_IMAGE), dist, tag, scratch], log)
     tar = Path(scratch) / f"heron-docker-{tag}-{dist}.tar.gz"
     tar_out = out_dir / tar.name
-    tar.replace(tar_out)
+    # using this rather than replace as it works if moving between devices
+    shutil.move(tar, tar_out)
     logging.info("docker image complete: %s", tar_out)
     return tar_out
 
@@ -125,7 +126,6 @@ def build_target(tag: str, target: str) -> typing.List[Path]:
         scratch = Path(tempfile.mkdtemp(prefix=f"build-{target}-"))
         log_path = scratch / "log.txt"
         log = log_path.open("w")
-        logging.debug("building %s", target)
 
         try:
             tar = build_dockerfile(scratch, target, tag, out_dir, log)
diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh
new file mode 100755
index 00000000000..c7aae4e0c12
--- /dev/null
+++ b/scripts/travis/install.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -o errexit -o nounset -o pipefail
+
+DIR=`dirname $0`
+UTILS=${DIR}/../shutils
+source ${UTILS}/common.sh
+
+# Autodiscover the platform
+PLATFORM=$(discover_platform)
+echo "Using $PLATFORM platform"
+
+# install heron locally
+bazel --bazelrc=tools/travis/bazel.rc run --config=$PLATFORM -- scripts/packages:heron-install.sh --user
diff --git a/scripts/travis/k8s.sh b/scripts/travis/k8s.sh
index ee5b6655cbf..8a594f5f211 100755
--- a/scripts/travis/k8s.sh
+++ b/scripts/travis/k8s.sh
@@ -17,12 +17,21 @@
 # under the License.
 :<<'DOC'
 set NO_CACHE=1 to always rebuild images.
+set DEBUG=1 to not clean up
+
+This requires kubectl, and kind.
 
 DOC
 set -o errexit -o nounset -o pipefail
 TAG=test
 HERE="$(cd "$(dirname "$0")"; pwd -P)"
-ROOT="$(cd "$HERE/../.."; pwd -P)"
+ROOT="$(git rev-parse --show-toplevel)"
+
+CLUSTER_NAME="kubernetes"
+
+API_URL="http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy"
+TRACKER_URL="http://localhost:8001/api/v1/namespaces/default/services/heron-tracker:8888/proxy"
+UI_URL="http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy"
 
 function bazel_file {
     # bazel_file VAR_NAME //some/build:target
@@ -39,14 +48,6 @@ function kind_images {
     docker exec -it kind-control-plane crictl images
 }
 
-function install_helm3 {
-    pushd /tmp
-        curl --location https://get.helm.sh/helm-v3.2.1-linux-amd64.tar.gz --output helm.tar.gz
-        tar --extract --file=helm.tar.gz --strip-components=1 linux-amd64/helm
-        mv helm ~/.local/bin/
-    popd
-}
-
 function action {
     (
         tput setaf 4;
@@ -55,12 +56,23 @@ function action {
     ) > /dev/stderr
 }
 
+function clean {
+    if [ -z "${DEBUG-}" ]; then
+        action "Cleaning up"
+        kind delete cluster
+        kill -TERM -$$
+    else
+        action "Not cleaning up due to DEBUG flag being set"
+    fi
+}
 
 function create_cluster {
     # trap "kind delete cluster" EXIT
     if [ -z "$(kind get clusters)" ]; then
         action "Creating kind cluster"
         kind create cluster --config="$0.kind.yaml"
+    else
+        action "Using existing kind cluster"
     fi
 }
 
@@ -83,6 +95,27 @@ function get_image {
     archive="$out"
 }
 
+function url_wait {
+    local seconds="$1"
+    local url="$2"
+    local retries=0
+    tput sc
+    while ! curl "$url" --location --fail --silent --output /dev/null --write-out "attempt $retries: %{http_code}"
+    do
+        retries=$((retries + 1))
+        if [ $retries -eq 60 ]; then
+            echo
+            return 1
+        fi
+        sleep 1
+        tput el1
+        tput rc
+        tput sc
+    done
+    echo
+}
+
+trap clean EXIT
 create_cluster
 
 get_image debian11
@@ -98,11 +131,36 @@ image_bookkeeper="docker.io/apache/bookkeeper:4.13.0"
 docker pull "$image_bookkeeper"
 kind load docker-image "$image_bookkeeper"
 
-action "Deploying heron with helm"
-# install heron in kind using helm
-bazel_file helm_yaml //scripts/packages:index.yaml
-helm install heron "$(dirname "$helm_yaml")/heron-0.0.0.tgz" \
-    --set image="$image_heron" \
-    --set imagePullPolicy=IfNotPresent \
-    --set bookieReplicas=1 \
-    --set zkReplicas=1
+action "Deploying to kubernetes"
+#kubectl create namespace default
+kubectl config set-context kind-kind --namespace=default
+
+# deploy
+DIR=./deploy/kubernetes/minikube
+sed "s#heron/heron:latest#$image_heron#g" ${DIR}/zookeeper.yaml > /tmp/zookeeper.yaml
+sed "s#heron/heron:latest#$image_heron#g" ${DIR}/tools.yaml > /tmp/tools.yaml
+sed "s#heron/heron:latest#$image_heron#g" ${DIR}/apiserver.yaml > /tmp/apiserver.yaml
+
+kubectl proxy -p 8001 &
+
+kubectl create -f /tmp/zookeeper.yaml
+kubectl get pods
+kubectl create -f ${DIR}/bookkeeper.yaml
+kubectl create -f /tmp/tools.yaml
+kubectl create -f /tmp/apiserver.yaml
+
+action "waiting for API server"
+url_wait 120 "$API_URL/api/v1/version"
+action "waiting for UI"
+url_wait 120 "$UI_URL/proxy"
+
+kubectl port-forward service/zookeeper 2181:2181 &
+
+action "API:       $API_URL"
+action "Tracker:   $TRACKER_URL"
+action "UI:        $UI_URL"
+action "Zookeeper: 127.0.0.1:2181"
+
+heron config "$CLUSTER_NAME" set service_url "$API_URL"
+
+"$HERE/test.sh"
diff --git a/scripts/travis/k8s.sh.kind.yaml b/scripts/travis/k8s.sh.kind.yaml
index d39ca9389c5..1dde884d96c 100644
--- a/scripts/travis/k8s.sh.kind.yaml
+++ b/scripts/travis/k8s.sh.kind.yaml
@@ -17,5 +17,7 @@
 
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+# to change kubernetes version, see the tags+digests here: https://hub.docker.com/r/kindest/node/tags
 nodes:
 - role: control-plane
+#  image: kindest/node:v1.16.9@sha256:7175872357bc85847ec4b1aba46ed1d12fa054c83ac7a8a11f5c268957fd5765
diff --git a/scripts/travis/test.sh b/scripts/travis/test.sh
index 7bf754ea909..f14e9c98b94 100755
--- a/scripts/travis/test.sh
+++ b/scripts/travis/test.sh
@@ -37,11 +37,13 @@ start_timer "$T"
 ${UTILS}/save-logs.py "heron_build_integration_test.txt" bazel build integration_test/src/...
 end_timer "$T"
 
+:<<'SKIPPING-FOR-NOW'
 # install heron 
 T="heron install"
 start_timer "$T"
 ${UTILS}/save-logs.py "heron_install.txt" bazel run -- scripts/packages:heron-install.sh --user
 end_timer "$T"
+SKIPPING-FOR-NOW
 
 # install tests
 T="heron tests install"
@@ -51,11 +53,13 @@ end_timer "$T"
 
 pathadd ${HOME}/bin/
 
+:<<'SKIPPING-FOR-NOW'
 # run local integration test
 T="heron integration_test local"
 start_timer "$T"
 ./bazel-bin/integration_test/src/python/local_test_runner/local-test-runner
 end_timer "$T"
+SKIPPING-FOR-NOW
 
 # initialize http-server for integration tests
 T="heron integration_test http-server initialization"
@@ -65,45 +69,68 @@ http_server_id=$!
 trap "kill -9 $http_server_id" SIGINT SIGTERM EXIT
 end_timer "$T"
 
-# run the scala integration test
-T="heron integration_test scala"
-start_timer "$T"
-${HOME}/bin/test-runner \
-  -hc heron -tb ${SCALA_INTEGRATION_TESTS_BIN} \
-  -rh localhost -rp 8080\
-  -tp ${HOME}/.herontests/data/scala \
-  -cl local -rl heron-staging -ev devel
-end_timer "$T"
+function integration_test {
+    # integration_test $cluster $test_bin
+    local cluster="$1"
+    local language="$2"
+    local test_bin="$3"
+    local host port
+    if [ "$cluster" == "local" ]; then
+        host=localhost
+        port=8080
+    else
+        #host="$(docker inspect kind-control-plane --format '{{ .NetworkSettings.Networks.kind.IPAddress }}')"
+        host="host.docker.internal"
+        host="$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' kind-control-plane)"
+        #host=172.17.0.1
+        port=8080
+    fi
 
-# run the java integration test
-T="heron integration_test java"
-start_timer "$T"
-${HOME}/bin/test-runner \
-  -hc heron -tb ${JAVA_INTEGRATION_TESTS_BIN} \
-  -rh localhost -rp 8080\
-  -tp ${HOME}/.herontests/data/java \
-  -cl local -rl heron-staging -ev devel
-end_timer "$T"
+    local T="$language integration test on $cluster"
+    start_timer "$T"
+    "${HOME}/bin/test-runner" \
+        --heron-cli-path=heron \
+        --tests-bin-path="$test_bin" \
+        --http-server-hostname="$host" \
+        --http-server-port="$port" \
+        --topologies-path="${HOME}/.herontests/data/$language" \
+        --cluster="$cluster" \
+        --role=heron-staging \
+        --env=devel \
+        #--cli-config-path="$cluster"
+    end_timer "$T"
+}
 
-# run the python integration test
-T="heron integration_test python"
-start_timer "$T"
-${HOME}/bin/test-runner \
-  -hc heron -tb ${PYTHON_INTEGRATION_TESTS_BIN} \
-  -rh localhost -rp 8080\
-  -tp ${HOME}/.herontests/data/python \
-  -cl local -rl heron-staging -ev devel
-end_timer "$T"
+# look at making the whole test script a function, e.g.
+#   ./test.sh heron-k8s
+#   ./test.sh local
+# concurrent runs from different clusters are fine?
+for cluster in kubernetes local; do
+    if [ "$cluster" == "local" ]; then
+        host=localhost
+        port=8080
+    else
+        host="$(docker inspect kind-control-plane --format='{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}')"
+        #host=172.18.0.1
+        port=8080
+    fi
+    integration_test "$cluster" scala "${SCALA_INTEGRATION_TESTS_BIN}"
+    integration_test "$cluster" java "${JAVA_INTEGRATION_TESTS_BIN}"
+    integration_test "$cluster" python ${PYTHON_INTEGRATION_TESTS_BIN} \
 
-# run the java integration topology test
-T="heron integration_topology_test java"
-start_timer "$T"
-${HOME}/bin/topology-test-runner \
-  -hc heron -tb ${JAVA_INTEGRATION_TOPOLOGY_TESTS_BIN} \
-  -rh localhost -rp 8080\
-  -tp ${HOME}/.herontests/data/java/topology_test \
-  -cl local -rl heron-staging -ev devel
-end_timer "$T"
+    T="heron integration_topology_test java"
+    start_timer "$T"
+    "${HOME}/bin/topology-test-runner" \
+      --heron-cli-path=heron \
+      --tests-bin-path="${JAVA_INTEGRATION_TOPOLOGY_TESTS_BIN}" \
+      --http-hostname="$host" \
+      --http-port="$port" \
+      --topologies-path="${HOME}/.herontests/data/java/topology_test" \
+      --cluster="$cluster" \
+      --role=heron-staging \
+      --env=devel
+      #--cli-config-path="$cluster"
+    end_timer "$T"
+done
 
 print_timer_summary
-
diff --git a/vagrant/local-ci.sh b/vagrant/local-ci.sh
index 256991ad1d6..b944887a4b7 100755
--- a/vagrant/local-ci.sh
+++ b/vagrant/local-ci.sh
@@ -18,11 +18,12 @@
 :<<'DOC'
 This script is for running tests in a local VM, similar to the environment used in the CI pipeline. If the targent script fails, a shell will be opened up within the VM.
 
-To only run integration tests:
-  ./local-ci.sh test
+To run all of the tests:
+  ./local-ci.sh
 
-To run the full ci pipeline:
-  ./local-ci.sh ci
+To run a specific command/script:
+  ./local-ci.sh ./scripts/travis/ci.sh
+  ./local-ci.sh bash
 
 DOC
 
@@ -36,7 +37,6 @@ if [ "$state" != "running" ]; then
     vagrant up primary
 fi
 
-
 # allows you to do `$0 test` to run only integration tests
 script="${1-ci}"
 env="JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/"