diff --git a/debian/changelog b/debian/changelog
index aa512d87..54bf54aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ shadow (1:4.1.2-1) experimental; urgency=low
   * Versioned Replaces on manpages-tr (<<1..5) as conflicting manpages have
     been removed in that package
   * debian/patches/402_cppw_selinux: Add SE Linux support for cppw / cpgr.
+  * debian/patches/900_testsuite_groupmems, debian/patches/901_testsuite_gcov:
+    Added patches, only intended to be used in the testsuite.
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 07 Apr 2008 23:00:26 +0200
 
diff --git a/debian/patches/900_testsuite_groupmems b/debian/patches/900_testsuite_groupmems
new file mode 100644
index 00000000..442eb2f3
--- /dev/null
+++ b/debian/patches/900_testsuite_groupmems
@@ -0,0 +1,89 @@
+Index: shadow-4.1.2/debian/passwd.install
+===================================================================
+--- shadow-4.1.2.orig/debian/passwd.install	2008-09-11 18:45:39.228009162 +0200
++++ shadow-4.1.2/debian/passwd.install	2008-09-11 19:11:34.616009434 +0200
+@@ -9,6 +9,7 @@
+ usr/sbin/cppw
+ usr/sbin/groupadd
+ usr/sbin/groupdel
++usr/sbin/groupmems
+ usr/sbin/groupmod
+ usr/sbin/grpck
+ usr/sbin/grpconv
+@@ -33,6 +34,7 @@
+ usr/share/man/*/man8/chpasswd.8
+ usr/share/man/*/man8/groupadd.8
+ usr/share/man/*/man8/groupdel.8
++usr/share/man/*/man8/groupmems.8
+ usr/share/man/*/man8/groupmod.8
+ usr/share/man/*/man8/grpck.8
+ usr/share/man/*/man8/grpconv.8
+@@ -59,6 +61,7 @@
+ usr/share/man/man8/chpasswd.8
+ usr/share/man/man8/groupadd.8
+ usr/share/man/man8/groupdel.8
++usr/share/man/man8/groupmems.8
+ usr/share/man/man8/groupmod.8
+ usr/share/man/man8/grpck.8
+ usr/share/man/man8/grpconv.8
+Index: shadow-4.1.2/debian/passwd.postinst
+===================================================================
+--- shadow-4.1.2.orig/debian/passwd.postinst	2008-09-11 18:51:29.460008023 +0200
++++ shadow-4.1.2/debian/passwd.postinst	2008-09-11 18:56:16.504010411 +0200
+@@ -31,6 +31,24 @@
+     			exit 1
+ 		)
+ 	fi
++	if ! getent group groupmems | grep -q '^groupmems:[^:]*:99'
++	then
++		groupadd -g 99 groupmems || (
++    			cat <<EOF
++************************  TESTSUITE  *****************************
++Group ID 99 has been allocated for the groupmems group.  You have either
++used 99 yourself or created a groupmems group with a different ID.
++Please correct this problem and reconfigure with ``dpkg --configure passwd''.
++
++Note that both user and group IDs in the range 0-99 are globally
++allocated by the Debian project and must be the same on every Debian
++system.
++EOF
++    			exit 1
++		)
++# FIXME
++		chgrp groupmems /usr/sbin/groupmems
++	fi
+     ;;
+ esac
+ 
+Index: shadow-4.1.2/debian/rules
+===================================================================
+--- shadow-4.1.2.orig/debian/rules	2008-09-11 18:42:53.984006775 +0200
++++ shadow-4.1.2/debian/rules	2008-09-11 19:06:32.904009108 +0200
+@@ -59,6 +59,7 @@
+ 	dh_installpam -p passwd --name=passwd
+ 	dh_installpam -p passwd --name=chfn
+ 	dh_installpam -p passwd --name=chsh
++	dh_installpam -p passwd --name=groupmems
+ ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ # login is not built on The Hurd, but some utilities of passwd depends on
+ # /etc/login.defs.
+@@ -89,3 +90,6 @@
+ 	chgrp shadow debian/passwd/usr/bin/expiry
+ 	chmod g+s debian/passwd/usr/bin/chage
+ 	chmod g+s debian/passwd/usr/bin/expiry
++	chgrp groupmems debian/passwd/usr/sbin/groupmems
++	chmod g+s debian/passwd/usr/sbin/groupmems
++	chmod o-x debian/passwd/usr/sbin/groupmems
+Index: shadow-4.1.2/debian/passwd.groupmems.pam
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.1.2/debian/passwd.groupmems.pam	2008-09-11 19:01:00.820006938 +0200
+@@ -0,0 +1,8 @@
++# The PAM configuration file for the Shadow 'groupmod' service
++#
++
++# This allows root to modify groups without being prompted for a password
++auth		sufficient	pam_rootok.so
++
++# checks for account validity
++account	required	pam_permit.so
diff --git a/debian/patches/901_testsuite_gcov b/debian/patches/901_testsuite_gcov
new file mode 100644
index 00000000..41357946
--- /dev/null
+++ b/debian/patches/901_testsuite_gcov
@@ -0,0 +1,39 @@
+Index: shadow-4.1.2/lib/Makefile.am
+===================================================================
+--- shadow-4.1.2.orig/lib/Makefile.am	2008-09-13 15:59:00.620008129 +0000
++++ shadow-4.1.2/lib/Makefile.am	2008-09-13 15:59:34.012007695 +0000
+@@ -1,6 +1,8 @@
+ 
+ AUTOMAKE_OPTIONS = 1.0 foreign
+ 
++CFLAGS += -fprofile-arcs -ftest-coverage
++
+ DEFS = 
+ 
+ noinst_LTLIBRARIES = libshadow.la
+Index: shadow-4.1.2/libmisc/Makefile.am
+===================================================================
+--- shadow-4.1.2.orig/libmisc/Makefile.am	2008-09-13 15:59:03.492007531 +0000
++++ shadow-4.1.2/libmisc/Makefile.am	2008-09-13 15:59:39.588002811 +0000
+@@ -1,6 +1,8 @@
+ 
+ EXTRA_DIST = .indent.pro xgetXXbyYY.c
+ 
++CFLAGS += -fprofile-arcs -ftest-coverage
++
+ INCLUDES = -I$(top_srcdir)/lib
+ 
+ noinst_LIBRARIES = libmisc.a
+Index: shadow-4.1.2/src/Makefile.am
+===================================================================
+--- shadow-4.1.2.orig/src/Makefile.am	2008-09-13 15:58:57.640009757 +0000
++++ shadow-4.1.2/src/Makefile.am	2008-09-13 15:59:46.948008401 +0000
+@@ -6,6 +6,8 @@
+ usbindir = ${prefix}/sbin
+ suidperms = 4755
+ 
++CFLAGS += -fprofile-arcs -ftest-coverage
++
+ INCLUDES = \
+ 	-I${top_srcdir}/lib \
+ 	-I$(top_srcdir)/libmisc
diff --git a/debian/patches/series b/debian/patches/series
index ba04ce6e..b82fefd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,7 @@
+# These patches are only for the testsuite:
+#900_testsuite_groupmems
+#901_testsuite_gcov
+
 503_shadowconfig.8
 431_su_uid_0_not_root
 008_su_no_sanitize_env
@@ -34,3 +38,4 @@
 200_Czech_binary_translation
 494_passwd_lock-no_account_lock
 302_remove_non_translated_polish_manpages
+402_cppw_selinux