diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild
index ae421db271..6321f1a107 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_with python) \
-		$(use_with test check "${ESYSROOT}/usr")
+		$(use_enable test check)
 }
 
 src_compile() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild
index bac9752212..7b853da8a2 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_with python) \
-		$(use_with test check "${ESYSROOT}/usr")
+		$(use_enable test check)
 }
 
 src_compile() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.4.ebuild
index 5c7bf03fe2..63ed423fc1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.4.ebuild
@@ -35,6 +35,9 @@ src_prepare() {
 	sed -i \
 		-e 's/libcheck.a/libcheck.so/g' \
 		configure.ac || die
+	sed -i \
+		-e "s/lib\/libcheck/$(get_libdir)\/libcheck/g" \
+		configure.ac || die
 	sed -i \
 		-e 's|-L$libdir ||g' \
 		dnet-config.in || die
@@ -56,7 +59,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_with python) \
-		$(use_with test check "${ESYSROOT}/usr")
+		$(use_enable test check)
 }
 
 src_compile() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.17.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.17.0.ebuild
index 9114d65293..6375fca7a5 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.17.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.17.0.ebuild
@@ -39,6 +39,9 @@ src_prepare() {
 	sed -i \
 		-e 's/libcheck.a/libcheck.so/g' \
 		configure.ac || die
+	sed -i \
+		-e "s/lib\/libcheck/$(get_libdir)\/libcheck/g" \
+		configure.ac || die
 	sed -i \
 		-e 's|-L$libdir ||g' \
 		dnet-config.in || die