diff --git a/tests/container-registry/run-test.sh b/tests/container-registry/run-test.sh
index a1abd15b..60142f50 100755
--- a/tests/container-registry/run-test.sh
+++ b/tests/container-registry/run-test.sh
@@ -135,7 +135,7 @@ docker push localhost:80/hello-world
 # Wait for the catalog to reflect the pushed image
 registry_ok=false
 for i in {1..10}; do
-    registry_response=$(curl -s -X GET http://localhost:80/v2/_catalog)
+    registry_response=$(curl -s -k -X GET https://localhost/v2/_catalog)
     if [[ "$registry_response" == *"hello-world"* ]]; then
         registry_ok=true
         break
diff --git a/tests/k8s-deploy/run-deploy-test.sh b/tests/k8s-deploy/run-deploy-test.sh
index 0cd095ef..78305b94 100755
--- a/tests/k8s-deploy/run-deploy-test.sh
+++ b/tests/k8s-deploy/run-deploy-test.sh
@@ -32,7 +32,7 @@ wait_for_log_output () {
 
         local log_output=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir logs )
 
-        if [[ ! -z "$log_output" ]]; then
+        if [[ ! -z "$log_output" ]] && [[ "$log_output" != *"No logs available"* ]] && [[ "$log_output" != *"Pods not running"* ]]; then
             # if ready, return
             return
         else
@@ -129,7 +129,7 @@ if [[ "$log_output_3" == *"filesystem is fresh"* ]]; then
     echo "deployment logs test: passed"
 else
     echo "deployment logs test: FAILED"
-    echo $log_output_3
+    echo "$log_output_3"
     delete_cluster_exit
 fi
 
@@ -164,7 +164,7 @@ if [[ "$log_output_5" == *"/data: MOUNTED"* ]]; then
     echo "deployment bind volumes test: passed"
 else
     echo "deployment bind volumes test: FAILED"
-    echo $log_output_5
+    echo "$log_output_5"
     delete_cluster_exit
 fi
 
@@ -174,7 +174,7 @@ if [[ "$log_output_6" == *"/data2: MOUNTED"* ]]; then
     echo "deployment provisioner volumes test: passed"
 else
     echo "deployment provisioner volumes test: FAILED"
-    echo $log_output_6
+    echo "$log_output_6"
     delete_cluster_exit
 fi
 
diff --git a/tests/k8s-deployment-control/run-test.sh b/tests/k8s-deployment-control/run-test.sh
index 89a7d06d..360543df 100755
--- a/tests/k8s-deployment-control/run-test.sh
+++ b/tests/k8s-deployment-control/run-test.sh
@@ -199,7 +199,7 @@ if [[ "$log_output_1" == *"filesystem is fresh"* ]]; then
     echo "deployment of pod test: passed"
 else
     echo "deployment pod test: FAILED"
-    echo $log_output_1
+    echo "$log_output_1"
     delete_cluster_exit
 fi