diff --git a/sys-auth/sssd/sssd-2.3.1.ebuild b/sys-auth/sssd/sssd-2.3.1.ebuild
index 389a9df..5bac8ff 100644
--- a/sys-auth/sssd/sssd-2.3.1.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1.ebuild
@@ -80,7 +80,6 @@ RDEPEND="${DEPEND}
 BDEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
-		app-crypt/p11-kit
 		dev-libs/check
 		dev-libs/softhsm:2
 		dev-util/cmocka
@@ -138,24 +137,7 @@ src_configure() {
 
 python_configure() {
 	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--with-pid-path="${EPREFIX}"/run
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-db-path="${EPREFIX}"/var/lib/sss/db
-		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
-		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
-		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
-		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
-		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
-		--with-log-path="${EPREFIX}"/var/log/sssd
-		--with-os=gentoo
-		--with-nscd="${EPREFIX}"/usr/sbin/nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--sbindir=/usr/sbin
-		$(multilib_native_use_with selinux)
+		"${commonargs[@]}"
 		--without-kcm
 		--without-secrets
 		--without-samba
@@ -171,8 +153,6 @@ python_configure() {
 		--without-autofs
 		--without-ssh
 		--disable-valgrind
-		--with-crypto="libcrypto"
-		--without-python2-bindings
 		--with-python3-bindings
 	)
 	mkdir "${BUILD_DIR}" || die
@@ -182,9 +162,8 @@ python_configure() {
 }
 
 multilib_src_configure() {
-	local myconf=()
-
-	myconf+=(
+	# configure args shared by python and non-python builds
+	local commonargs=(
 		--localstatedir="${EPREFIX}"/var
 		--with-pid-path="${EPREFIX}"/run
 		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
@@ -202,11 +181,19 @@ multilib_src_configure() {
 		--with-unicode-lib="glib2"
 		--disable-rpath
 		--sbindir=/usr/sbin
+		$(multilib_native_use_with selinux)
+		--with-crypto="libcrypto"
+		--without-python2-bindings
+	)
+
+	local myconf=()
+
+	myconf+=(
+		"${commonargs[@]}"
 		$(multilib_native_use_with kcm)
 		$(multilib_native_use_with secrets)
 		$(multilib_native_use_with samba)
 		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
 		$(multilib_native_use_with selinux semanage)
 		$(use_enable locator krb5-locator-plugin)
 		$(use_enable pac pac-responder)
@@ -218,8 +205,6 @@ multilib_src_configure() {
 		$(multilib_native_use_with autofs)
 		$(multilib_native_use_with ssh)
 		$(use_enable valgrind)
-		--with-crypto="libcrypto"
-		--without-python2-bindings
 		--without-python3-bindings
 	)