diff --git a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy
index 09eb30ad43..ba1734bd58 100644
--- a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy
+++ b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy
@@ -267,7 +267,17 @@ pipeline {
                                                         timeout 300 docker pull "${PD_IMAGE}"
                                                         timeout 300 docker pull "${TIKV_IMAGE}"
                                                         timeout 300 docker pull "${TIDB_IMAGE}"
-                                                        timeout 300 docker pull "${TIDB_FAILPOINT_IMAGE}" || true
+                                                        # release-6.5 failpoint images may no longer be published.
+                                                        # Fall back to the regular branch image so compose does not hard-fail on a missing tag,
+                                                        # and skip fail-point-tests that require a real failpoint TiDB binary.
+                                                        if ! timeout 300 docker pull "${TIDB_FAILPOINT_IMAGE}"; then
+                                                            echo "WARN: ${TIDB_FAILPOINT_IMAGE} not found; falling back to ${TIDB_IMAGE}"
+                                                            TIDB_FAILPOINT_IMAGE="${TIDB_IMAGE}"
+                                                            if [ -f ./run.sh ] && grep -q 'tidb-ci/fail-point-tests' ./run.sh; then
+                                                                echo "WARN: skipping tidb-ci/fail-point-tests because TiDB failpoint image is unavailable"
+                                                                sed -i -e 's#./run-test.sh tidb-ci/fail-point-tests && ##g' ./run.sh
+                                                            fi
+                                                        fi
                                                         timeout 600 docker pull "${TIFLASH_IMAGE}"
 
                                                         find ../docker . -name '*.yaml' -type f -exec sed -i \
@@ -278,6 +288,7 @@ pipeline {
                                                             -e 's#${TIFLASH_IMAGE:[^}]*}#'"${TIFLASH_IMAGE}"'#g' \
                                                             -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base:rocky8-20241028#${TIFLASH_IMAGE}#g" \
                                                             -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base:rocky9-20250529#${TIFLASH_IMAGE}#g" \
+                                                            -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base$#'"${TIFLASH_IMAGE}"'#g' \
                                                             -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tics:${TAG:-master}#'"${TIFLASH_IMAGE}"'#g' \
                                                             -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tikv/pd/image:${PD_BRANCH:-master}#'"${PD_IMAGE}"'#g' \
                                                             -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tikv/pd/image:master#${PD_IMAGE}#g" \