diff --git a/debian/changelog b/debian/changelog
index 82def95d..2792fac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ llvm-toolchain-snapshot (1:4.0~svn275970-1~exp1) experimental; urgency=medium
   * ship clang-tblgen & yaml-bench as part of the libclang-common-X.Y-dev
     package
 
+  * amd64 llvm testsuite is green, bring back the failure in case of error
   * Fix the cmake paths in llvm-3.9-dev deb package. Thanks to Brad King
     for the patch (Closes: #819072)
   * LLVMConfig.cmake is now installed to <prefix>/lib/cmake/llvm instead of
@@ -186,6 +187,8 @@ llvm-toolchain-3.8 (1:3.8.1-8) unstable; urgency=medium
     testsuite
   * Disable lldb on ppc64
   * libfuzzer depends on the same version of clang (Closes: #833564)
+  * Use filter into of findstring in the gold usage. Thanks Doko for the
+    suggestion
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 07 Aug 2016 14:10:09 +0200
 
diff --git a/debian/rules b/debian/rules
index 2a0dfb30..a295a106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -430,7 +430,7 @@ override_dh_installdeb:
 
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 # List of the archs we know we have 100 % tests working
-ARCH_LLVM_TEST_OK := i386
+ARCH_LLVM_TEST_OK := i386 amd64
 
 override_dh_auto_test: