diff --git a/Makefile b/Makefile
index 1f637ad9b..1e4c85134 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ CC		:= gcc
 ECHO		:= echo
 NM		:= nm
 AWK		:= awk
-SH		:= sh
+SH		:= bash
 MAKE		:= make
 OBJCOPY		:= objcopy
 
@@ -190,6 +190,8 @@ clean:
 	$(Q) $(RM) -rf ./test/dump/
 	$(Q) $(RM) -f ./*.gcov ./*.gcda ./*.gcno
 	$(Q) $(RM) -rf ./gcov
+	$(Q) $(RM) -rf ./test/lib/
+	$(Q) $(RM) -rf ./test/lib64/
 	$(Q) $(MAKE) -C protobuf/ clean
 	$(Q) $(MAKE) -C arch/$(ARCH)/ clean
 	$(Q) $(MAKE) -C pie/ clean
diff --git a/test/zdtm.sh b/test/zdtm.sh
index 2e9daae2d..70da47295 100644
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -180,15 +180,18 @@ construct_root()
 {
 	local root=$1
 	local test_path=$2
-	local libdir=$root/lib64
+	local libdir=$root/lib
+	local libdir2=$root/lib64
 
-	mkdir $libdir
+	mkdir $libdir $libdir2
 	for i in `ldd $test_path | awk '{ print $1 }' | grep -v vdso`; do
 		local lib=`basename $i`
 		[ -f $libdir/$lib ] && continue ||
-		[ -f $i ] && cp $i $libdir && continue ||
-		[ -f /lib64/$i ] && cp /lib64/$i $libdir && continue ||
-		[ -f /usr/lib64/$i ] && cp /usr/lib64/$i $libdir || return 1
+		[ -f $i ] && cp $i $libdir && cp $i $libdir2 && continue ||
+		[ -f /lib64/$i ] && cp /lib64/$i $libdir && cp /lib64/$i $libdir2 && continue ||
+		[ -f /usr/lib64/$i ] && cp /usr/lib64/$i $libdir && cp /usr/lib64/$i $libdir2 && continue ||
+		[ -f /lib/x86_64-linux-gnu/$i ] && cp /lib/x86_64-linux-gnu/$i $libdir && cp /lib/x86_64-linux-gnu/$i $libdir2 && continue ||
+		[ -f /lib/arm-linux-gnueabi/$i ] && cp /lib/arm-linux-gnueabi/$i $libdir && cp /lib/arm-linux-gnueabi/$i $libdir2 && continue || echo "Failed at " $i && return 1
 	done
 }