diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
index d154a1e248633..c6c4634e58b61 100644
--- a/x-pack/qa/rolling-upgrade/build.gradle
+++ b/x-pack/qa/rolling-upgrade/build.gradle
@@ -186,6 +186,10 @@ subprojects {
         setting 'xpack.watcher.encrypt_sensitive_data', 'true'
       }
 
+      if (version.onOrAfter('6.6.0')) {
+        setting 'ccr.auto_follow.wait_for_metadata_timeout', '1s'
+      }
+
       // Old versions of the code contain an invalid assertion that trips
       // during tests.  Versions 5.6.9 and 6.2.4 have been fixed by removing
       // the assertion, but this is impossible for released versions.