diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d98c780d..7718df45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ test-tsan:
   variables:
     CFLAGS: '-fsanitize=thread'
     # Temporarily suppress known errors or false positives.
-    TSAN_OPTIONS: 'suppressions=/builds/TIE/ultravideo/kvazaar/tests/tsan_suppressions.txt'
+    TSAN_OPTIONS: 'suppressions=/builds/cs/ultravideo/kvazaar/tests/tsan_suppressions.txt'
 
 test-ubsan:
   <<: *test-template
diff --git a/src/encmain.c b/src/encmain.c
index f8aaa899..96f49854 100644
--- a/src/encmain.c
+++ b/src/encmain.c
@@ -268,7 +268,7 @@ done:
 
   // This thread exit call causes problems with media auto-build suite
   // The environment compiles with MINGW using a different pthreads lib
-  #ifndef __MINGW32__
+  #if !defined(__MINGW32__) || !defined(__MINGW64__)
   pthread_exit(NULL);
   #endif
   return NULL;