diff --git a/dev-libs/memkind/memkind-1.13.0.ebuild b/dev-libs/memkind/memkind-1.13.0.ebuild
index ac1b429598..cebc5a68ac 100644
--- a/dev-libs/memkind/memkind-1.13.0.ebuild
+++ b/dev-libs/memkind/memkind-1.13.0.ebuild
@@ -46,7 +46,9 @@ pkg_pretend() {
 src_prepare() {
 	default
 	eautoreconf
-	cd jemalloc && eautoreconf
+	pushd jemalloc || die
+	eautoreconf
+	popd || die
 }
 
 src_configure() {
@@ -78,6 +80,8 @@ src_install() {
 
 src_test() {
 	addwrite /proc/sys/vm/nr_hugepages
-	echo 3000 > /proc/sys/vm/nr_hugepages
+	NR_HUGEPAGES_INITIAL="$(cat /proc/sys/vm/nr_hugepages)" || die
+	echo 3000 > /proc/sys/vm/nr_hugepages || die
 	emake check
+	echo ${NR_HUGEPAGES_INITIAL} > /proc/sys/vm/nr_hugepages || die
 }