diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
index 0c8aaf2e..6992a1bd 100644
--- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
+++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 @@ -8,6 +8,7 @@
  //
  // UNSUPPORTED: libcpp-has-no-threads
@@ -10,14 +10,14 @@ Index: llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd/libcxx/test/std/
  
  // <condition_variable>
  
-Index: llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210218085556+fcdef15d77bd/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 @@ -13,6 +13,7 @@
- // XFAIL: with_system_cxx_lib=macosx10.11
- // XFAIL: with_system_cxx_lib=macosx10.10
- // XFAIL: with_system_cxx_lib=macosx10.9
+ // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11
+ // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
+ // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
 +// XFAIL: *
  
  // ALLOW_RETRIES: 2
diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
index 1a76b910..3462ffbb 100644
--- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
+++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
 @@ -11,6 +11,8 @@
  // template<class RealType, size_t bits, class URNG>
  //     RealType generate_canonical(URNG& g);
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/
  #include <random>
  #include <cassert>
  
-Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/re/re.traits/isctype.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/re/re.traits/isctype.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/re/re.traits/isctype.pass.cpp
-@@ -12,6 +12,7 @@
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/re/re.traits/isctype.pass.cpp
+@@ -14,6 +14,7 @@
  
  // bool isctype(charT c, char_class_type f) const;
  
@@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/
  
  #include <regex>
  #include <cassert>
-Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 @@ -12,6 +12,8 @@
- // XFAIL: with_system_cxx_lib=macosx10.10
- // XFAIL: with_system_cxx_lib=macosx10.9
+ // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
+ // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
  
 +// XFAIL: *
 +
  #include <cassert>
  #include <cstdio>
  #include <cstdlib>
-Index: llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
-+++ llvm-toolchain-snapshot_13~++20210301090218+fd64580f74c9/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+--- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
++++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
 @@ -15,6 +15,8 @@
  
  // template <class T, class... Args> void construct(T* p, Args&&... args);