diff --git a/tests/overlay/041 b/tests/overlay/041
index 4e72348d..f3be746a 100755
--- a/tests/overlay/041
+++ b/tests/overlay/041
@@ -168,7 +168,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino)
 [[ $subdir_d == "subdir d" ]] || \
 	echo "Merged dir: Invalid d_ino reported for subdir"
 
-_scratch_unmount
+$UMOUNT_PROG $SCRATCH_MNT
 
 # check overlayfs
 _overlay_check_scratch_dirs $lowerdir $upperdir $workdir
@@ -186,9 +186,6 @@ mkdir -p $lowerdir/test_dir/pure_lower_dir/subdir
 
 _scratch_mkfs
 
-upperdir=$OVL_BASE_SCRATCH_MNT/ovl-upper
-workdir=$OVL_BASE_SCRATCH_MNT/ovl-work
-
 _overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir
 
 # Copy up test_dir