diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
index 3bbf47755..adcc36b97 100644
--- a/.github/workflows/functional-tests.yml
+++ b/.github/workflows/functional-tests.yml
@@ -58,9 +58,25 @@ jobs:
       - name: Run cFS
         run: |
           ./core-cpu1 | tee cFS_startup_cpu1.txt &
-          sleep 20
-          ../host/cmdUtil --pktid=0x1806 --cmdcode=4 --endian=LE --string="20:CFE_APP" --string="20:CFE_TestMain" --string="64:cfe_testcase" --uint32=16384 --uint8=0 --uint8=0 --uint16=100 &
+          sleep 10
+          ../host/cmdUtil --pktid=0x1806 --cmdcode=4 --endian=LE --string="20:CFE_TEST_APP" --string="20:CFE_TestMain" --string="64:cfe_testcase" --uint32=16384 --uint8=0 --uint8=0 --uint16=100 &
+
           sleep 30
+          counter=$(grep -c "CFE_TEST_APP" cFS_startup_cpu1.txt)
+
+          while [[ -z $(grep -i "SUMMARY" cFS_startup_cpu1.txt) ]]; do
+            echo "Waiting for CFE Tests"
+            sleep 60
+              temp=$(grep -c "CFE_TEST_APP" cFS_startup_cpu1.txt)
+              
+              if [ $temp -eq $counter ];
+              then
+              echo "Test is frozen. Quiting"
+                break
+              fi
+
+              counter=$(grep -c "CFE_TEST_APP" cFS_startup_cpu1.txt)
+          done
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
         working-directory: ./build/exe/cpu1/