diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9637f8ad..c6900320e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,6 +74,48 @@ jobs:
       - run: poe lint
       - run: poe build-develop
       - run: mkdir junit-xml
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
+      - run: poe test ${{matrix.pytestExtraArgs}} -k "test_update_handler_lock_acquisition_respects_timeout" -sv --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+        timeout-minutes: 5
       - run: poe test ${{matrix.pytestExtraArgs}} -s --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
         timeout-minutes: 15
       # Time skipping doesn't yet support ARM
diff --git a/temporalio/service.py b/temporalio/service.py
index 986878f41..b6b751542 100644
--- a/temporalio/service.py
+++ b/temporalio/service.py
@@ -1361,6 +1361,9 @@ async def _rpc_call(
                 logger.debug("Service %s response from %s: %s", service, rpc, resp)
             return resp
         except temporalio.bridge.client.RPCError as err:
+            logger.info(
+                "Service %s failed to call %s: %s", service, rpc, err, exc_info=True
+            )
             # Intentionally swallowing the cause instead of using "from"
             status, message, details = err.args
             raise RPCError(message, RPCStatusCode(status), details)
diff --git a/tests/helpers/__init__.py b/tests/helpers/__init__.py
index 79d3687fd..0a32cd614 100644
--- a/tests/helpers/__init__.py
+++ b/tests/helpers/__init__.py
@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import socket
 import time
 import uuid
@@ -32,6 +33,8 @@
     UpdateMethodMultiParam,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def new_worker(
     client: Client,
@@ -153,6 +156,7 @@ async def workflow_update_exists(
     client: Client, workflow_id: str, update_id: str
 ) -> bool:
     try:
+        logger.info("Checking workflow update status: %s", update_id)
         await client.workflow_service.poll_workflow_execution_update(
             PollWorkflowExecutionUpdateRequest(
                 namespace=client.namespace,