diff --git a/autopackage.sh b/autopackage.sh
index 5caf865b8..418762f0a 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -24,7 +24,9 @@ MAKEFLAGS=${MAKEFLAGS:--j16}
 cd $rootdir
 
 timing_enter porcelain_check
-$MAKE clean
+if [[ -e $rootdir/mk/config.mk ]]; then
+	$MAKE clean
+fi
 
 if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then
 	echo make clean left the following files:
diff --git a/test/external_code/test_make.sh b/test/external_code/test_make.sh
index 3e2150bca..90e78ffea 100755
--- a/test/external_code/test_make.sh
+++ b/test/external_code/test_make.sh
@@ -20,7 +20,9 @@ sudo HUGEMEM="$EXTERNAL_MAKE_HUGEMEM" $SPDK_DIR/scripts/setup.sh
 if [ -n "$SPDK_RUN_EXTERNAL_DPDK" ]; then
 	WITH_DPDK="--with-dpdk=$SPDK_RUN_EXTERNAL_DPDK"
 fi
-make -C $SPDK_DIR clean
+if [[ -e $SPDK_DIR/mk/config.mk ]]; then
+	make -C $SPDK_DIR clean
+fi
 $SPDK_DIR/configure --with-shared --without-ocf --disable-asan $WITH_DPDK
 make -C $SPDK_DIR -j$(nproc)
 
diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh
index dc34762a1..1c91facbd 100755
--- a/test/make/check_so_deps.sh
+++ b/test/make/check_so_deps.sh
@@ -305,7 +305,7 @@ if [ "$SPDK_TEST_OCF" -eq 1 ]; then
 	config_params="$config_params --with-ocf=$rootdir/ocf.a"
 fi
 
-if [[ -f $rootdir/mk/spdk.common.mk ]]; then
+if [[ -f $rootdir/mk/config.mk ]]; then
 	$MAKE $MAKEFLAGS clean
 fi