diff --git a/tests/e2e/runasnonroot.sh b/tests/e2e/runasnonroot.sh
index a557753329..970cbed88f 100644
--- a/tests/e2e/runasnonroot.sh
+++ b/tests/e2e/runasnonroot.sh
@@ -1,35 +1,81 @@
 #!/bin/bash
-
+# set -euxo
 namespace="kubeflow"
 error_flag=0
 
-# Get a list of pod names in the specified namespace
-pod_names=$(kubectl get pods -n $namespace -o json | jq -r '.items[].metadata.name')
-echo "Checking for root containers in namespace $namespace"
+# Function to check if 'id' command is available in a container
+has_id_command() {
+  local pod_name="$1"
+  local container_name="$2"
+
+  # Execute 'id' command and capture the output
+  if kubectl exec -it -n "$namespace" "$pod_name" -c "$container_name" -- id -u >/dev/null 2>&1; then
+    return 0  # 'id' command is available
+  else
+    return 1  # 'id' command is not available
+  fi
+}
+
+# Function to check if 'runAsNonRoot' is present in the container's security context
+has_runAsNonRoot() {
+  local pod_name="$1"
+  local container_name="$2"
+
+  # Use jq to check if 'securityContext' is missing in the container's security context
+  local securityContext=$(kubectl get pod -n "$namespace" "$pod_name" -o json | jq -r '.spec.containers[] | select(.name == "'"$container_name"'").securityContext')
+  
+  if [ "$securityContext" = "null" ]; then
+    echo "Error: 'securityContext' is missing in container $container_name of pod $pod_name"
+    return 1  # 'securityContext' is missing (fail)
+  fi
+  
+  # Use jq to check if 'runAsNonRoot' is missing in the container's security context
+  local runAsNonRoot=$(kubectl get pod -n "$namespace" "$pod_name" -o json | jq -r '.spec.containers[] | select(.name == "'"$container_name"'").securityContext.runAsNonRoot // "Missing"')
+
+  if [ "$runAsNonRoot" = "Missing" ]; then
+    echo "Error: 'runAsNonRoot' is missing in container $container_name of pod $pod_name"
+    return 1  # 'runAsNonRoot' is missing (fail)
+  else
+    return 0  # 'runAsNonRoot' is present
+  fi
+}
 
-# Loop through the pod names and execute the 'id' command within each container
+# Get a list of pod names in the specified namespace that are not in the "Completed" state
+pod_names=$(kubectl get pods -n "$namespace" --field-selector=status.phase!=Succeeded,status.phase!=Failed -o json | jq -r '.items[].metadata.name')
+
+# Loop through the pod names and execute checks
 for pod_name in $pod_names; do
   echo "Entering pod $pod_name in namespace $namespace..."
-  
-  container_names=$(kubectl get pod -n $namespace $pod_name -o json | jq -r '.spec.containers[].name')
+
+  container_names=$(kubectl get pod -n "$namespace" "$pod_name" -o json | jq -r '.spec.containers[].name')
 
   for container_name in $container_names; do
-    user_id=$(kubectl exec -it -n $namespace $pod_name -c $container_name -- id -u)
-    # echo "Container: $container_name - User ID: $user_id"
-    
-    if [ "$user_id" -eq 0 ]; then
-      echo "Error: Pod $pod_name contains user ID 0 in container $container_name"
+    if ! has_runAsNonRoot "$pod_name" "$container_name"; then
       error_flag=1
     fi
-  done
 
-  echo "-------------------------------------"
+    if has_id_command "$pod_name" "$container_name"; then
+      user_id=$(kubectl exec -it -n "$namespace" "$pod_name" -c "$container_name" -- id -u)
+      
+      # Clean up whitespace in the user_id using tr
+      user_id_cleaned=$(echo -n "$user_id" | tr -d '[:space:]')
+
+      if [ "$user_id_cleaned" = "0" ]; then
+        echo "Error: Pod $pod_name contains user ID 0 in container $container_name"
+        error_flag=1
+      else
+        echo "Container: $container_name - User ID: $user_id_cleaned"
+      fi
+    else
+      echo "Warning: 'id' command not available in container $container_name"
+    fi
+  done
 done
 
-# Exit with an error if any pod contains user ID 0
+# Exit with an error if any pod contains an error condition
 if [ $error_flag -eq 1 ]; then
   exit 1
 fi
 
-# Exit successfully if no pod contains user ID 0
-exit 0
\ No newline at end of file
+# Exit successfully
+exit 0