diff --git a/.github/workflows/test-platforms.yml b/.github/workflows/test-platforms.yml
index 68665436..9b92eff6 100644
--- a/.github/workflows/test-platforms.yml
+++ b/.github/workflows/test-platforms.yml
@@ -138,14 +138,19 @@ jobs:
         run: |
           set -eux
 
+          source ./containers/runner/skip-testtypes
           if [ ${{ matrix.platform }} == "daily-iso" ]; then
             echo "skip_tests=skip-on-fedora" >> $GITHUB_OUTPUT
+            echo "disabled_testtypes=$SKIP_TESTTYPES_DAILY_ISO" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rawhide" ]; then
             echo "skip_tests=skip-on-fedora" >> $GITHUB_OUTPUT
+            echo "disabled_testtypes=$SKIP_TESTTYPES_RAWHIDE" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rhel8" ]; then
             echo "skip_tests=skip-on-rhel,skip-on-rhel-8" >> $GITHUB_OUTPUT
+            echo "disabled_testtypes=$SKIP_TESTTYPES_RHEL8" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rhel9" ]; then
             echo "skip_tests=skip-on-rhel,skip-on-rhel-9" >> $GITHUB_OUTPUT
+            echo "disabled_testtypes=$SKIP_TESTTYPES_RHEL9" >> $GITHUB_OUTPUT
           else
             echo "Platform is not supported by kickstart tests yet!"
             exit 1
@@ -157,14 +162,20 @@ jobs:
         run: |
           set -eux
 
-          if [ -n "${{ needs.pr-info.outputs.launch_args }}" ]; then
-            echo "Running tests required by the comment explicitly."
-            LAUNCH_ARGS="${{ needs.pr-info.outputs.launch_args }}"
-          elif [ -n "${{steps.get_changed_tests.outputs.changed_tests }}" ]; then
+          CHANGED_TESTS="${{steps.get_changed_tests.outputs.changed_tests }}"
+          DISABLED_TESTTYPES="${{ steps.get_platform_skiptest.outputs.disabled_testtypes }}"
+          LAUNCH_ARGS="${{ needs.pr-info.outputs.launch_args }}"
+
+          if [ -n "${LAUNCH_ARGS}" ]; then
+            echo "Running tests required by the PR comment explicitly."
+          elif [ -n "${CHANGED_TESTS}" ]; then
             echo "Running tests affected by changes."
-            LAUNCH_ARGS="${{ steps.get_changed_tests.outputs.changed_tests }}"
+            LAUNCH_ARGS="${CHANGED_TESTS}"
+            if [ -n "${DISABLED_TESTTYPES}" ]; then
+              LAUNCH_ARGS="--skip-testtypes ${DISABLED_TESTTYPES} ${LAUNCH_ARGS}"
+            fi
           else
-            echo "Running smoke tests."
+            echo "Running smoke tests (no affected tests found)."
             LAUNCH_ARGS="--testtype smoke"
           fi