diff --git a/testing/check-logs.sh b/testing/check-logs.sh
index 8029b39e7e5..1694a15524d 100755
--- a/testing/check-logs.sh
+++ b/testing/check-logs.sh
@@ -16,10 +16,56 @@
 # This script requires: kubectl, kind, jq
 
 SCRIPT_DIR=$(dirname "$0")
+FINAL_RESULT=1
 export SCRIPT_DIR
 
 source "${SCRIPT_DIR}/common.sh"
 
+function perform_attempts_to_get_log_api_response() {
+	# This function will perform some attempts to get the API response.
+	for attempts_contacting_api in {1..1000}; do
+		echo "attempt ${attempts_contacting_api}/1000"
+		repeat 10 echo ""
+		echo "kubectl get pods -n tenant-lite"
+		kubectl get pods -n tenant-lite
+		kubectl port-forward storage-lite-ss-0-0 9443 --namespace tenant-lite &
+		process_id=$!
+		echo "process_id: ${process_id}"
+		echo 'Get token from MinIO Console'
+		COOKIE=$(
+			curl 'https://localhost:9443/api/v1/login' -vs \
+			-H 'content-type: application/json' \
+			--data-raw '{"accessKey":"minio","secretKey":"minio123"}' --insecure 2>&1 | \
+			grep "set-cookie: token=" | sed -e "s/< set-cookie: token=//g" | \
+			awk -F ';' '{print $1}'
+		)
+		echo "Cookie: ${COOKIE}"
+		# If there is no cookie, there is no sense to proceed, so fail if no cookie
+		if [ -z "$COOKIE" ]
+		then
+			echo "\$COOKIE is empty"
+		fi
+		echo 'Verify Logs via API'
+		RESULT=$(
+			curl 'https://localhost:9443/api/v1/logs/search?q=reqinfo&pageSize=100&pageNo=0&order=timeDesc' \
+			-H 'cookie: token='$COOKIE'' \
+			--compressed \
+			--insecure | jq '.results[0].response_status' | tr -d '"'
+		)
+		echo $RESULT
+		EXPECTED_RESULT=OK
+		echo $EXPECTED_RESULT
+		if [ "$EXPECTED_RESULT" = "$RESULT" ]; then
+			echo "Logs are present, no issue found"
+			FINAL_RESULT=0
+			break
+		else
+			echo "Logs are unreachable"
+		fi
+		sleep 30
+	done
+}
+
 function main() {
     destroy_kind
 
@@ -29,85 +75,11 @@ function main() {
 
     install_tenant
 
-    check_tenant_status tenant-lite storage-lite
-
-    echo 'start - wait for prometheus to appears'
-    i=0
-    while [[ $(kubectl get pods -n tenant-lite --selector=statefulset.kubernetes.io/pod-name=storage-lite-prometheus-0 -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]];
-    do
-	((i++))
-	echo "waiting for storage-lite-prometheus-0" && sleep 1;
-	if [[ $i -eq 300 ]]; then
-	    kubectl get pods -n tenant-lite -o wide
-	    kubectl describe pods -n tenant-lite
-            break
+	perform_attempts_to_get_log_api_response
+	if [ $FINAL_RESULT = 1 ]; then
+		echo "Test failed"
+		exit 1
 	fi
-    done
-    echo 'end - wait for prometheus to appears'
-
-    echo 'Wait for pod to be ready for port forward'
-    try kubectl wait --namespace tenant-lite \
-	--for=condition=ready pod \
-	--selector=statefulset.kubernetes.io/pod-name=storage-lite-ss-0-0 \
-	--timeout=120s
-
-    echo 'port forward without the hop, directly from the tenant/pod'
-    kubectl port-forward storage-lite-ss-0-0 9443 --namespace tenant-lite &
-
-    echo 'start - wait for port-forward to be completed'
-    sleep 15
-    echo 'end - wait for port-forward to be completed'
-
-    echo 'To display port connections'
-    sudo netstat -tunlp # want to see if 9443 is LISTEN state to proceed
-
-    echo 'start - open and allow port connection'
-    sudo apt install ufw
-    sudo ufw allow http
-    sudo ufw allow https
-    sudo ufw allow 9443/tcp
-    echo 'end - open and allow port connection'
-
-    echo 'Get token from MinIO Console'
-    COOKIE=$(
-	curl 'https://localhost:9443/api/v1/login' -vs \
-	     -H 'content-type: application/json' \
-	     --data-raw '{"accessKey":"minio","secretKey":"minio123"}' --insecure 2>&1 | \
-	    grep "set-cookie: token=" | sed -e "s/< set-cookie: token=//g" | \
-	    awk -F ';' '{print $1}'
-	  )
-    echo $COOKIE
-
-    echo 'start - wait for prometheus to be ready'
-    try kubectl wait --namespace tenant-lite \
-	--for=condition=ready pod \
-	--selector=statefulset.kubernetes.io/pod-name=storage-lite-prometheus-0 \
-	--timeout=300s
-    echo 'end - wait for prometheus to be ready'
-
-    echo 'start - print the entire output for debug'
-    curl 'https://localhost:9443/api/v1/admin/info/widgets/66/?step=0&' \
-	 -H 'cookie: token='$COOKIE'' \
-	 --compressed \
-	 --insecure
-    echo 'end - print the entire output for debug'
-
-    echo 'Verify Logs via API'
-    RESULT=$(
-	curl 'https://localhost:9443/api/v1/logs/search?q=reqinfo&pageSize=100&pageNo=0&order=timeDesc' \
-	     -H 'cookie: token='$COOKIE'' \
-	     --compressed \
-	     --insecure | jq '.results[0].response_status'
-	  )
-    echo $RESULT
-    EXPECTED_RESULT='"OK"'
-    echo $EXPECTED_RESULT
-    if [ "$EXPECTED_RESULT" = "$RESULT" ]; then
-        echo "Logs are present, no issue found"
-    else
-        echo "Logs are unreachable"
-        exit 111
-    fi
 
     destroy_kind
 }