diff --git a/debian/patches/bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch b/debian/patches/bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch
new file mode 100644
index 000000000..a1951d219
--- /dev/null
+++ b/debian/patches/bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 31 Oct 2015 18:04:28 +0000
+Subject: selftests: memfd: Stop unnecessary rebuilds
+
+Instead of explicitly running the compiler, add dependencies and take
+advantage of implicit rules to build only as necessary.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/tools/testing/selftests/memfd/Makefile
++++ b/tools/testing/selftests/memfd/Makefile
+@@ -4,16 +4,16 @@ CFLAGS += -I../../../../include/uapi/
+ CFLAGS += -I../../../../include/
+ CFLAGS += -I../../../../usr/include/
+ 
+-all:
+-	$(CC) $(CFLAGS) memfd_test.c -o memfd_test
+-
+ TEST_PROGS := memfd_test
+ 
++all: $(TEST_PROGS)
++
+ include ../lib.mk
+ 
+-build_fuse:
+-	$(CC) $(CFLAGS) fuse_mnt.c `pkg-config fuse --cflags --libs` -o fuse_mnt
+-	$(CC) $(CFLAGS) fuse_test.c -o fuse_test
++build_fuse: fuse_mnt fuse_test
++
++fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags)
++fuse_mnt: LDFLAGS += $(shell pkg-config fuse --libs)
+ 
+ run_fuse: build_fuse
+ 	@./run_fuse_test.sh || echo "fuse_test: [FAIL]"
diff --git a/debian/patches/series b/debian/patches/series
index 4651cd2d2..c80fa2247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -83,3 +83,4 @@ bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch
 bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch
 
 bugfix/all/selftests-add-missing-include-directives.patch
+bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch
diff --git a/debian/tests/selftests b/debian/tests/selftests
index b17f883ae..5acfaa78e 100644
--- a/debian/tests/selftests
+++ b/debian/tests/selftests
@@ -43,6 +43,9 @@ if [ "$step" -ge 0 ]; then
 	cd $ADTTMP/build
 	make headers_install
 
+	# Ignore compiler warnings
+	make -C tools/testing/selftests 2>&1 || echo >&2 "Build failed"
+
 	# Enable testing CLONE_USERNS by unprivileged users
 	sysctl kernel.unprivileged_userns_clone=1