diff --git a/internal/internal_workflow_client.go b/internal/internal_workflow_client.go
index 44e415ae4..a33875c00 100644
--- a/internal/internal_workflow_client.go
+++ b/internal/internal_workflow_client.go
@@ -1916,7 +1916,7 @@ func (w *workflowClientInterceptor) UpdateWorkflow(
 			if ctx.Err() != nil {
 				return nil, NewWorkflowUpdateServiceTimeoutOrCanceledError(err)
 			}
-			if code := status.Code(err); code == codes.Canceled || code == codes.DeadlineExceeded {
+			if status := serviceerror.ToStatus(err); status.Code() == codes.Canceled || status.Code() == codes.DeadlineExceeded {
 				return nil, NewWorkflowUpdateServiceTimeoutOrCanceledError(err)
 			}
 			return nil, err
diff --git a/test/worker_versioning_test.go b/test/worker_versioning_test.go
index a8438c1aa..018a164d1 100644
--- a/test/worker_versioning_test.go
+++ b/test/worker_versioning_test.go
@@ -639,6 +639,8 @@ func (ts *WorkerVersioningTestSuite) TestReachabilityUnversionedWorkerWithRules(
 }
 
 func (ts *WorkerVersioningTestSuite) TestReachabilityVersions() {
+	// Skip this test because it is flaky with server 1.25.0, versioning api is also actively undergoing changes
+	ts.T().SkipNow()
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	defer cancel()
 
@@ -717,6 +719,8 @@ func (ts *WorkerVersioningTestSuite) TestReachabilityVersions() {
 }
 
 func (ts *WorkerVersioningTestSuite) TestReachabilityVersionsWithRules() {
+	// Skip this test because it is flaky with server 1.25.0, versioning api is also actively undergoing changes
+	ts.T().SkipNow()
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	defer cancel()