diff --git a/service/worker/migration/handover_workflow.go b/service/worker/migration/handover_workflow.go
index df2811ea87d..a67dd1fa6a6 100644
--- a/service/worker/migration/handover_workflow.go
+++ b/service/worker/migration/handover_workflow.go
@@ -37,7 +37,7 @@ const (
 
 	minimumAllowedLaggingSeconds  = 5
 	maximumAllowedLaggingSeconds  = 120
-	maximumHandoverTimeoutSeconds = 10
+	maximumHandoverTimeoutSeconds = 30
 )
 
 type (
diff --git a/service/worker/migration/handover_workflow_test.go b/service/worker/migration/handover_workflow_test.go
index aa4bbb4eb9b..8281da8dd6a 100644
--- a/service/worker/migration/handover_workflow_test.go
+++ b/service/worker/migration/handover_workflow_test.go
@@ -62,7 +62,7 @@ func TestHandoverWorkflow(t *testing.T) {
 		Namespace:              "test-ns",
 		RemoteCluster:          "test-remote",
 		AllowedLaggingSeconds:  10,
-		HandoverTimeoutSeconds: 30,
+		HandoverTimeoutSeconds: 10,
 	})
 
 	require.True(t, env.IsWorkflowCompleted())
diff --git a/tests/xdc/failover_test.go b/tests/xdc/failover_test.go
index da0aa63bf7e..33268fc47a1 100644
--- a/tests/xdc/failover_test.go
+++ b/tests/xdc/failover_test.go
@@ -2700,7 +2700,7 @@ func (s *FunctionalClustersTestSuite) TestLocalNamespaceMigration() {
 		Namespace:              namespace,
 		RemoteCluster:          s.clusterNames[1],
 		AllowedLaggingSeconds:  10,
-		HandoverTimeoutSeconds: 30,
+		HandoverTimeoutSeconds: 10,
 	})
 	s.NoError(err)
 	err = run5.Get(testCtx, nil)