diff --git a/autopackage.sh b/autopackage.sh
index 9ba3322e9..eff16daaa 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -55,22 +55,30 @@ echo "tmpdir=$tmpdir"
 tar -C "$tmpdir" -xf $spdk_tarball
 
 if [ -z "$WITH_DPDK_DIR" ]; then
-	cd dpdk && git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}
+	cd dpdk
+	git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}
+	cd ..
 	tar -C "$tmpdir/${spdk_pv}" -xf $dpdk_tarball
 fi
 
 if [ -d "intel-ipsec-mb" ]; then
-	cd intel-ipsec-mb && git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}
+	cd intel-ipsec-mb
+	git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}
+	cd ..
 	tar -C "$tmpdir/${spdk_pv}" -xf $ipsec_tarball
 fi
 
 if [ -d "isa-l" ]; then
-	cd isa-l && git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}
+	cd isa-l
+	git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}
+	cd ..
 	tar -C "$tmpdir/${spdk_pv}" -xf $isal_tarball
 fi
 
 if [ -d "ocf" ]; then
-	cd ocf && git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
+	cd ocf
+	git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
+	cd ..
 	tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball
 fi
 
diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index 95ebad8b4..0a6dc6af0 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -188,7 +188,9 @@ if [ "$cov_avail" = "yes" ]; then
 	rm -f $UT_COVERAGE/ut_cov_base.info $UT_COVERAGE/ut_cov_test.info
 	genhtml $UT_COVERAGE/ut_cov_unit.info --output-directory $UT_COVERAGE
 	# git -C option not used for compatibility reasons
-	cd $rootdir && git clean -f "*.gcda"
+	cd $rootdir
+	git clean -f "*.gcda"
+	cd -
 fi
 
 set +x