diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cc910bab5..3dc1e67fb 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -36,6 +36,7 @@ clean:
 	done
 
 check:
+	@$(ZFS) -u
 	@echo
 	@echo -n "===================================="
 	@echo -n " ZTEST "
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 8c6e67d54..3e68eda65 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -732,6 +732,7 @@ clean:
 	done
 
 check:
+	@$(ZFS) -u
 	@echo
 	@echo -n "===================================="
 	@echo -n " ZTEST "
diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index 674ec57fd..31c3011c7 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -60,6 +60,7 @@ fi
 
 # Perform pre-cleanup is requested
 if [ ${CLEANUP} ]; then
+	${ZFS_SH} -u
 	cleanup_md_devices
 	cleanup_loop_devices
 	rm -f /tmp/zpool.cache.*
diff --git a/scripts/zfault.sh b/scripts/zfault.sh
index 08d822538..7f7740424 100755
--- a/scripts/zfault.sh
+++ b/scripts/zfault.sh
@@ -88,6 +88,7 @@ fi
 
 # Perform pre-cleanup is requested
 if [ ${CLEANUP} ]; then
+	${ZFS_SH} -u
 	cleanup_md_devices
 	cleanup_loop_devices
 	rm -f /tmp/zpool.cache.*