diff --git a/sys-auth/sssd/sssd-2.3.1-r1.ebuild b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
index de580f5..464c542 100644
--- a/sys-auth/sssd/sssd-2.3.1-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
@@ -14,10 +14,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs kcm +locator +netlink nfsv4 nls +manpages pac python samba secrets selinux sudo ssh systemd test"
+IUSE="acl +autofs kcm +locator +netlink nfsv4 nls +manpages pac python samba secrets selinux sudo ssh systemd test valgrind"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="pac? ( samba )
+REQUIRED_USE="test? ( ssh sudo )
+	pac? ( samba )
 	kcm? ( systemd )
 	secrets? ( systemd )"
 
@@ -75,12 +76,23 @@ RDEPEND="${DEPEND}
 	>=sys-libs/glibc-2.17[nscd]
 	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 	"
+# FIXME: Add pam_wrapper when it enters the tree. Bug #730974
 BDEPEND="${DEPEND}
-	test? ( dev-libs/check )
+	test? (
+		app-crypt/p11-kit
+		dev-libs/check
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/uid_wrapper
+		valgrind? ( dev-util/valgrind )
+	)
 	manpages? (
 		>=dev-libs/libxslt-1.1.26
 		app-text/docbook-xml-dtd:4.4
-		)"
+	)"
 
 CONFIG_CHECK="~KEYS"
 
@@ -148,6 +160,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with sudo)
 		$(multilib_native_use_with autofs)
 		$(multilib_native_use_with ssh)
+		$(use_enable valgrind)
 		--with-crypto="libcrypto"
 		--without-python2-bindings
 		${python3_configure}