diff --git a/service/history/history_engine2_test.go b/service/history/history_engine2_test.go
index 4a3b25973fd..9f48d21a9b6 100644
--- a/service/history/history_engine2_test.go
+++ b/service/history/history_engine2_test.go
@@ -230,8 +230,8 @@ func (s *engine2Suite) SetupTest() {
 
 	s.historyEngine = h
 
-	s.tv = testvars.New(s.T()).
-		WithNamespaceID(tests.NamespaceID)
+	s.tv = testvars.New(s.T()).WithNamespaceID(tests.NamespaceID)
+	s.tv = s.tv.WithRunID(s.tv.Any().RunID())
 }
 
 func (s *engine2Suite) SetupSubTest() {
diff --git a/tests/versioning_3_test.go b/tests/versioning_3_test.go
index c343184a04c..3dc3ecc2fe9 100644
--- a/tests/versioning_3_test.go
+++ b/tests/versioning_3_test.go
@@ -140,15 +140,17 @@ func (s *Versioning3Suite) TestUnpinnedTask_OldDeployment() {
 	s.RunTestWithMatchingBehavior(
 		func() {
 			tv := testvars.New(s)
+			tvOldDeployment := tv.WithBuildIDNumber(1)
+			tvNewDeployment := tv.WithBuildIDNumber(2)
 			// previous current deployment
-			s.updateTaskQueueDeploymentData(tv.WithBuildIDNumber(2), time.Minute, tqTypeWf)
+			s.updateTaskQueueDeploymentData(tvOldDeployment, time.Minute, tqTypeWf)
 			// current deployment
-			s.updateTaskQueueDeploymentData(tv, 0, tqTypeWf)
+			s.updateTaskQueueDeploymentData(tvNewDeployment, 0, tqTypeWf)
 
 			s.startWorkflow(tv, nil)
 
 			s.idlePollWorkflow(
-				tv.WithBuildIDNumber(2),
+				tvOldDeployment,
 				true,
 				ver3MinPollTime,
 				"old deployment should not receive unpinned task",