diff --git a/tests/e2e/scenarios/bare-metal/dump-artifacts b/tests/e2e/scenarios/bare-metal/dump-artifacts
index 77ec77ebb3f7a..cdd867b9f7f54 100755
--- a/tests/e2e/scenarios/bare-metal/dump-artifacts
+++ b/tests/e2e/scenarios/bare-metal/dump-artifacts
@@ -65,3 +65,7 @@ for ns in kube-system; do
     kubectl logs -n ${ns} ${pod} > ${ARTIFACTS}/logs/${ns}/${pod}.log || true
   done
 done
+
+# Use `kops toolbox dump` to dump a lot of useful information
+mkdir -p ${ARTIFACTS}/dump
+${KOPS} toolbox dump --dir ${ARTIFACTS}/dump --k8s-resources --private-key ${REPO_ROOT}/.build/.ssh/id_ed25519 --ssh-user root
diff --git a/tests/e2e/scenarios/bare-metal/run-test b/tests/e2e/scenarios/bare-metal/run-test
index c3da8254703aa..a013ce55e0388 100755
--- a/tests/e2e/scenarios/bare-metal/run-test
+++ b/tests/e2e/scenarios/bare-metal/run-test
@@ -28,7 +28,7 @@ BINDIR=${WORKDIR}/bin
 mkdir -p "${BINDIR}"
 go build -o ${BINDIR}/kops ./cmd/kops
 
-KOPS=${BINDIR}/kops
+export KOPS=${BINDIR}/kops
 
 function cleanup() {
   echo "running dump-artifacts"