diff --git a/debian/patches/test-installed.patch b/debian/patches/debian/0008-test-installed.patch
similarity index 79%
rename from debian/patches/test-installed.patch
rename to debian/patches/debian/0008-test-installed.patch
index 0fe678e..dc962e9 100644
--- a/debian/patches/test-installed.patch
+++ b/debian/patches/debian/0008-test-installed.patch
@@ -1,4 +1,5 @@
-Description: Test installed files
+Author: Felix Lechner <felix.lechner@lease-up.com>
+Description: Test installed files (Closes: #872118).
  The test suite seems to check the executable bit on the local build product
  'mdadm' but runs all programs from the system PATH. This change should test
  the installed version.
@@ -12,13 +13,10 @@ Description: Test installed files
  .
  Incorporates a suggestion from the fdisk maintainer to specify the fdisk
  prerequisite explicitly.
-Author: Felix Lechner <felix.lechner@lease-up.com>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872118
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tests/func.sh
-+++ b/tests/func.sh
+
+diff -Naurp mdadm.orig/tests/func.sh mdadm/tests/func.sh
+--- mdadm.orig/tests/func.sh
++++ mdadm/tests/func.sh
 @@ -101,10 +101,6 @@ check_env() {
  		echo "test: testing can only be done as 'root'."
  		exit 1
diff --git a/debian/patches/series b/debian/patches/series
index d08c03d..e845110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ debian/0004-exit-gracefully-when-md-device-not-found.patch
 debian/0005-sha1-includes.patch
 debian/0006-readlink-path.patch
 debian/0007-no-Werror.patch
-test-installed.patch
+debian/0008-test-installed.patch