diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9749a74ca..5512996e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,6 +93,7 @@ jobs:
             --search-attribute CustomDoubleField=Double \
             --search-attribute CustomBoolField=Bool \
             --dynamic-config-value system.enableActivityEagerExecution=true \
+              --dynamic-config-value history.MaxBufferedQueryCount=10000 \
             --dynamic-config-value frontend.workerVersioningDataAPIs=true \
             --dynamic-config-value component.nexusoperations.recordCancelRequestCompletionEvents=true \
             --dynamic-config-value component.callbacks.allowedAddresses='[{"Pattern":"*","AllowInsecure":true}]' \
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java
index fa2b0ca40..12b3e0c23 100644
--- a/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java
+++ b/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java
@@ -646,6 +646,7 @@ public void failWhenUpdateNamesDoNotMatch() {
   }
 
   @Test
+  @SuppressWarnings("deprecation") // Test uses deprecated policy for validation
   public void failServerSideWhenStartIsInvalid() {
     WorkflowClient workflowClient = testWorkflowRule.getWorkflowClient();
 
diff --git a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java
index 469fde42d..92004cdf3 100644
--- a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java
+++ b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java
@@ -310,6 +310,8 @@ public void startWorkflowExecution(
     }
   }
 
+  @SuppressWarnings(
+      "deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING
   StartWorkflowExecutionResponse startWorkflowExecutionImpl(
       StartWorkflowExecutionRequest startRequest,
       Duration backoffStartInterval,
@@ -475,6 +477,8 @@ private StartWorkflowExecutionResponse throwDuplicatedWorkflow(
         WorkflowExecutionAlreadyStartedFailure.getDescriptor());
   }
 
+  @SuppressWarnings(
+      "deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING
   private void validateWorkflowIdReusePolicy(
       WorkflowIdReusePolicy reusePolicy, WorkflowIdConflictPolicy conflictPolicy) {
     if (conflictPolicy != WorkflowIdConflictPolicy.WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED
diff --git a/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java b/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java
index 989dd8150..5b3cb0401 100644
--- a/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java
+++ b/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java
@@ -80,6 +80,7 @@ public void alreadyRunningWorkflowBlocksSecondEvenWithAllowDuplicate() {
   }
 
   @Test
+  @SuppressWarnings("deprecation") // Test for deprecated policy behavior
   public void secondWorkflowTerminatesFirst() {
     String workflowId = "terminate-if-running-1";
     WorkflowOptions options =