diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh
index 07e8479299..7caca2120c 100755
--- a/test/external-e2e/run.sh
+++ b/test/external-e2e/run.sh
@@ -22,8 +22,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
 DRIVER="test"
 
 install_ginkgo () {
-    apt update -y
-    apt install -y golang-ginkgo-dev
+    go install github.com/onsi/ginkgo/ginkgo@v1.14.0
 }
 
 setup_e2e_binaries() {
diff --git a/test/utils/azuredisk_log.sh b/test/utils/azuredisk_log.sh
index b4679a5ebe..dee3e60465 100755
--- a/test/utils/azuredisk_log.sh
+++ b/test/utils/azuredisk_log.sh
@@ -49,14 +49,12 @@ kubectl get pods -n${NS} -l${LABEL} \
 #    | awk 'NR>1 {print $1}' \
 #    | xargs -I {} bash -c "echo 'dumping logs for ${NS}/{}' && kubectl logs {} -n${NS}"
 
-echo "print out csi-$DRIVER-node logs ..."
-echo "======================================================================================"
 LABEL="app=csi-$DRIVER-node"
-kubectl get pods -n${NS} -l${LABEL} \
-    | awk 'NR>1 {print $1}' \
-    | xargs -I {} bash -c "echo 'dumping logs for ${NS}/{}/${DRIVER}' && kubectl logs {} -c${CONTAINER} -n${NS}"
+if [ -n "$TEST_WINDOWS" ]; then
+    LABEL="app=csi-$DRIVER-node-win"
+fi
 
-echo "print out csi-$DRIVER-node-win logs ..."
+echo "print out $LABEL logs ..."
 echo "======================================================================================"
 LABEL="app=csi-$DRIVER-node-win"
 kubectl get pods -n${NS} -l${LABEL} \