diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 10f8ce9e85..5f55b0fd31 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -22,6 +22,8 @@ Fixed
 
   Contributed by @khushboobhatia01
 
+* Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487
+
 3.6.0 - October 29, 2021
 ------------------------
 
diff --git a/st2common/bin/st2-self-check b/st2common/bin/st2-self-check
index b7c1916bba..d7d1a0b85a 100755
--- a/st2common/bin/st2-self-check
+++ b/st2common/bin/st2-self-check
@@ -140,7 +140,7 @@ do
 
     START_TS=$(date +%s)
     OUTPUT=$(st2 run ${TEST} protocol=${PROTOCOL} token=${ST2_AUTH_TOKEN})
-    echo ${OUTPUT} | grep "status" | grep -q "succeeded"
+    echo "${OUTPUT}" | grep "status" | grep -q "succeeded"
     EXIT_CODE=$?
     END_TS=$(date +%s)
     DURATION=$(expr ${END_TS} - ${START_TS})
@@ -159,7 +159,7 @@ if [ ${RUN_ORQUESTA_TESTS} = "true" ]; then
 
     START_TS=$(date +%s)
     OUTPUT=$(st2 run examples.orquesta-examples)
-    echo ${OUTPUT} | grep "status" | grep -q "succeeded"
+    echo "${OUTPUT}" | grep "status" | grep -q "succeeded"
     EXIT_CODE=$?
     END_TS=$(date +%s)
     DURATION=$(expr ${END_TS} - ${START_TS})