diff --git a/debian/changelog b/debian/changelog
index 018e6d9b..5442e2f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 llvm-toolchain-3.8 (1:3.8~+rc1-1~exp1) experimental; urgency=medium
 
   * New snapshot release
-  * For now, disable the fail on testsuite on amd64 & i386
   * Cmake migration. Done by Andrew Wilkins. Many thanks to him
     - Update patches to set SONAME in CMake build
     - Create symlinks with ".links", don't install from build tree
diff --git a/debian/rules b/debian/rules
index 5a723bb8..3a77bb80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -317,9 +317,9 @@ ifeq (${AUTOCONF_BUILD},yes)
 endif
 
 # Remove artefact (where compiler-rt is built)
-	if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \
-	cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux && rm -rf $$(find . -mindepth 2 -maxdepth 2 -type d) && rm -rf $$(find -empty) && rm -rf */.dir; \
-	fi
+#	if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \
+#	cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux && rm -rf $$(find . -mindepth 2 -maxdepth 2 -type d) && rm -rf $$(find -empty) && rm -rf */.dir; \
+#	fi
 
 	mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/
 	cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION)
@@ -339,14 +339,15 @@ endif
 # and remove things that are installed by autoconf but are
 # not intended for distribution.
 ifeq (${AUTOCONF_BUILD},yes)
-	cp clang/tools/clang-format/git-clang-format $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin
-	cp clang/tools/clang-format/clang-format-diff.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
-	cp clang/tools/clang-format/clang-format.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
-	cp clang/tools/clang-format/clang-format.el $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
-	cp clang/tools/clang-format/clang-format-sublime.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
+	cp -p clang/tools/clang-format/git-clang-format $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin
+	cp -p clang/tools/clang-format/clang-format-diff.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
+	cp -p clang/tools/clang-format/clang-format.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
+	cp -p clang/tools/clang-format/clang-format.el $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
+	cp -p clang/tools/clang-format/clang-format-sublime.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang
 	mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.1
 endif
 
+
 # Remove things that CMake or autoconf install but which aren't packaged yet,
 # or are packaged from the source or build tree.
 ifneq (${AUTOCONF_BUILD},yes)
@@ -468,7 +469,7 @@ override_dh_installdeb:
 # Managed by the package
 	dh_installdeb -a
 
-	rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc
+	rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc $(CURDIR)/debian/python-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc
 	rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make*
 	rm -f $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT
 
@@ -480,8 +481,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 := 
-#amd64 i386
+ARCH_LLVM_TEST_OK := i386
 
 override_dh_auto_test: