diff --git a/debian/changelog b/debian/changelog
index a8ad0dd8..f7a858be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ llvm-toolchain-snapshot (1:7~svn327768-2) UNRELEASED; urgency=medium
   * Fix debian-watch-uses-insecure-uri as upstream has now https
   * Standards-Version updated to 4.1.3
   * llvm-dsymutil has been renamed to dsymutil
+  * Remove sysconf_interceptor_bypass_test.cc because it makes
+    Debian unstable and Ubuntu bionic freeze
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 17 Mar 2018 16:53:15 +0100
 
diff --git a/debian/patches/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff
new file mode 100644
index 00000000..e19d0a9e
--- /dev/null
+++ b/debian/patches/remove-test-freezing.diff
@@ -0,0 +1,32 @@
+Index: llvm-toolchain-snapshot_7~svn323616/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+===================================================================
+--- llvm-toolchain-snapshot_7~svn323616.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
++++ llvm-toolchain-snapshot_7~svn323616/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+@@ -1,27 +0,0 @@
+-// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
+-
+-// XFAIL: android
+-
+-#include <stdio.h>
+-
+-// getauxval() used instead of sysconf() in GetPageSize() is defined starting
+-// glbc version 2.16.
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16)
+-extern "C" long sysconf(int name) {
+-  fprintf(stderr, "sysconf wrapper called\n");
+-  return 0;
+-}
+-#endif  // defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16)
+-
+-int main() {
+-  // All we need to check is that the sysconf() interceptor defined above was
+-  // not called. Should it get called, it will crash right there, any
+-  // instrumented code executed before sanitizer init is finished will crash
+-  // accessing non-initialized sanitizer internals. Even if it will not crash
+-  // in some configuration, it should never be called anyway.
+-  fprintf(stderr, "Passed\n");
+-  // CHECK-NOT: sysconf wrapper called
+-  // CHECK: Passed
+-  // CHECK-NOT: sysconf wrapper called
+-  return 0;
+-}
diff --git a/debian/patches/series b/debian/patches/series
index c77aa6e9..01259c90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ silent-test-macho.diff
 silent-llvm-isel-fuzzer.diff
 test-keep-alive.diff
 library-binary-filename.diff
+remove-test-freezing.diff