diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/changelog libreoffice-vanilla-5.0.1/debian/changelog
--- libreoffice-vanilla-5.0.1~rc2/debian/changelog	2015-08-27 10:06:20.000000000 +0000
+++ libreoffice-vanilla-5.0.1/debian/changelog	2015-08-28 10:15:03.000000000 +0000
@@ -1,3 +1,37 @@
+libreoffice-vanilla (1:5.0.1-0ubuntu1~minimal1~vivid1) vivid; urgency=medium
+
+  * merge from wily for test patch and final tarballs
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 28 Aug 2015 12:14:17 +0200
+
+libreoffice-vanilla (1:5.0.1-0ubuntu1~minimal1~wily1) wily; urgency=medium
+
+  * 5.0.1~rc2 is final
+  * also make ~minimal1 more significant than ~wily1, to prevent trouble here
+    later
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 28 Aug 2015 12:10:36 +0200
+
+libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~wily1~minimal3) wily; urgency=medium
+
+  * yank over patches/disable-tiledrendering-test.diff from Debian package
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 28 Aug 2015 11:35:16 +0200
+
+libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~vivid2~minimal2) vivid; urgency=medium
+
+  * merge from wily for arch dependant test code
+  * reenable tests on amd64/i386 as the link-time cppunit breakage is possibly
+    only gcc5/wily related
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 27 Aug 2015 13:29:08 +0200
+
+libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~wily1~minimal2) wily; urgency=medium
+
+  * seems like gcc5 broke internal cppunit ~everywhere, thus disabling tests on all archs
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 27 Aug 2015 12:59:17 +0200
+
 libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~vivid1~minimal2) vivid; urgency=medium
 
   * Attempt new vivid build based on new upstream LO pre-release
diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/patches/disable-tiledrendering-test.diff libreoffice-vanilla-5.0.1/debian/patches/disable-tiledrendering-test.diff
--- libreoffice-vanilla-5.0.1~rc2/debian/patches/disable-tiledrendering-test.diff	1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-vanilla-5.0.1/debian/patches/disable-tiledrendering-test.diff	2015-08-28 10:15:03.000000000 +0000
@@ -0,0 +1,17 @@
+diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
+index 000c2fe..6d7e1c6 100644
+--- a/libreofficekit/Module_libreofficekit.mk
++++ b/libreofficekit/Module_libreofficekit.mk
+@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit))
+ 
+ ifeq ($(OS),LINUX)
+ 
+-$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
+-    CppunitTest_libreofficekit_tiledrendering \
+-))
++#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
++#    CppunitTest_libreofficekit_tiledrendering \
++#))
+ 
+ ifneq ($(ENABLE_GTK),)
+ $(eval $(call gb_Module_add_targets,libreofficekit,\
diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/patches/series libreoffice-vanilla-5.0.1/debian/patches/series
--- libreoffice-vanilla-5.0.1~rc2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-vanilla-5.0.1/debian/patches/series	2015-08-28 10:15:03.000000000 +0000
@@ -0,0 +1 @@
+disable-tiledrendering-test.diff
diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/rules libreoffice-vanilla-5.0.1/debian/rules
--- libreoffice-vanilla-5.0.1~rc2/debian/rules	2015-08-26 19:57:43.000000000 +0000
+++ libreoffice-vanilla-5.0.1/debian/rules	2015-08-28 10:15:03.000000000 +0000
@@ -1,5 +1,19 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq (,$(strip $(filter armhf armel powerpc,$(1))))
+define run_tests_on_arch
+	echo Running tests on $(1) ...
+	make -k check || true # there currently seem to be missing dependencies for make check (possibly b/c of --disable-dependency-tracking)
+	make check
+endef
+else
+define run_tests_on_arch
+	echo Skipping tests on $(1).
+endef
+endif
+
 define remove_office_part
 for file in `grep -v ^%dir workdir/debian_gids/gid_Module_$(strip $(1))|sed -e 's/^/debian\/libreoffice-vanilla/'`; \
 do \
@@ -72,10 +86,7 @@
 
 override_dh_auto_test:
 	dh_testdir
-ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
-	make -k check || true # there currently seem to be missing dependencies for make check (possibly b/c of --disable-dependency-tracking)
-	make check
-endif
+	$(call run_tests_on_arch,$(DEB_HOST_ARCH))
 
 override_dh_auto_install:
 	dh_testdir