diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e60e48d690ab83f56e5dc800ac30f3c05648716..079d8235e755b4a4d3701328dbffa1b6d5ebf288 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -326,15 +326,18 @@ codec-smoke-test:
     - .rules-merge-request
   timeout: "10 minutes"
   stage: test
-  needs: ["build-codec-linux-cmake"]
+  needs: ["build-codec-linux-cmake", "build-codec-linux-make",  "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]
   script:
     - *print-common-info
     - bash ci/smoke_test.sh
     ### analyze for failures
-    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
-    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
-    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi
-    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi
+    - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
+    - ret_val=0
+    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val=1; fi
+    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
+    - exit $ret_val
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
     expire_in: 1 week