diff -Nru xapian-core-1.2.18/debian/changelog xapian-core-1.2.18/debian/changelog
--- xapian-core-1.2.18/debian/changelog	2014-06-28 23:13:34.000000000 +0000
+++ xapian-core-1.2.18/debian/changelog	2014-07-05 23:29:56.000000000 +0000
@@ -1,3 +1,9 @@
+xapian-core (1.2.18-1+rpi1) jessie-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 05 Jul 2014 23:29:37 +0000
+
 xapian-core (1.2.18-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru xapian-core-1.2.18/debian/rules xapian-core-1.2.18/debian/rules
--- xapian-core-1.2.18/debian/rules	2014-06-28 23:05:06.000000000 +0000
+++ xapian-core-1.2.18/debian/rules	2014-07-05 23:30:35.000000000 +0000
@@ -50,9 +50,10 @@
     confflags += --build $(DEB_HOST_GNU_TYPE)
 else
     confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-    # Disable the testsuite when cross-compiling.
-    DEB_BUILD_OPTIONS += nocheck
 endif
+# Disable the testsuite
+DEB_BUILD_OPTIONS += nocheck
+
 
 # For i386 and *-i386.
 ifeq ($(patsubst %-i386,i386,$(DEB_HOST_ARCH)), i386)