diff --git a/contrib/buildbot/ignore-logs.txt b/contrib/buildbot/ignore-logs.txt
--- a/contrib/buildbot/ignore-logs.txt
+++ b/contrib/buildbot/ignore-logs.txt
@@ -1,3 +1,3 @@
 # Wine occasionally deadlocks during cross-builds tests. It should be safe to
 # ignore until we're able to update wine with a version where this is fixed.
-err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \d*, blocked by \d*, retrying
+err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \w*, blocked by \w*, retrying
diff --git a/contrib/buildbot/test/data/testlog_ignore.zip b/contrib/buildbot/test/data/testlog_ignore.zip
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/contrib/buildbot/test/test_endpoint_status.py b/contrib/buildbot/test/test_endpoint_status.py
--- a/contrib/buildbot/test/test_endpoint_status.py
+++ b/contrib/buildbot/test/test_endpoint_status.py
@@ -711,7 +711,7 @@
             # Greedy match with some escaped characters
             br'\d*:err:ntdll:RtlpWaitForCriticalSection section .* retrying \(60 sec\)',
             # Less greedy match
-            br'err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \d*, blocked by \d*, retrying',
+            br'err:ntdll:RtlpWaitForCriticalSection section \w* "\?" wait timed out in thread \w*, blocked by \w*, retrying',
         ]
         for pattern in testPatterns:
             self.teamcity.getIgnoreList.return_value = [