diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 74d4fd3cf5..bcdf241e9b 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -143,6 +143,23 @@ if $publicNetwork; then
   create_args+=(-P)
 fi
 
+shutdown() {
+  exitcode=$?
+
+  set +e
+  echo "--- Upload artifacts"
+  for logfile in net/log/*; do
+    if [[ -f $logfile ]]; then
+      upload-ci-artifact "$logfile"
+      tail "$logfile"
+    fi
+  done
+
+  exit $exitcode
+}
+
+trap shutdown EXIT INT
+
 set -x
 
 echo "--- $cloudProvider.sh delete"
diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index dbf7ec5fea..5ea38b1346 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -31,6 +31,23 @@ zone=$3
 [[ -n $cloudProvider ]] || usage "Cloud provider not specified"
 [[ -n $zone ]] || usage "Zone not specified"
 
+shutdown() {
+  exitcode=$?
+
+  set +e
+  echo "--- Upload artifacts"
+  for logfile in net/log/*; do
+    if [[ -f $logfile ]]; then
+      upload-ci-artifact "$logfile"
+      tail "$logfile"
+    fi
+  done
+
+  exit $exitcode
+}
+
+trap shutdown EXIT INT
+
 set -x
 echo "--- $cloudProvider.sh config"
 timeout 5m net/"$cloudProvider".sh config -p "$netName" -z "$zone"