diff --git a/tests/apply-diff.bats b/tests/apply-diff.bats
index 0f4351dd1d..83807c845e 100644
--- a/tests/apply-diff.bats
+++ b/tests/apply-diff.bats
@@ -44,3 +44,60 @@ load helpers
 	checkchanges
 	checkdiffs
 }
+
+@test "apply-diff-from-staging-directory" {
+	case "$STORAGE_DRIVER" in
+	overlay*)
+		;;
+	*)
+		skip "driver $STORAGE_DRIVER does not support diff-from-staging-directory"
+		;;
+	esac
+
+	SRC=$TESTDIR/source
+	mkdir -p $SRC
+	createrandom $SRC/file1
+	createrandom $SRC/file2
+	createrandom $SRC/file3
+
+	local sconf=$TESTDIR/storage.conf
+
+	local root=`storage status 2>&1 | awk '/^Root:/{print $2}'`
+	local runroot=`storage status 2>&1 | awk '/^Run Root:/{print $3}'`
+
+	cat >$sconf <<EOF
+[storage]
+driver="overlay"
+graphroot="$root"
+runroot="$runroot"
+
+[storage.options]
+pull_options = {enable_partial_images = "true" }
+EOF
+
+	# Create a layer.
+	CONTAINERS_STORAGE_CONF=$sconf run storage --debug=false create-layer
+	[ "$status" -eq 0 ]
+	[ "$output" != "" ]
+	layer="$output"
+
+	CONTAINERS_STORAGE_CONF=$sconf run storage --debug=false applydiff-using-staging-dir $layer $SRC
+	[ "$status" -eq 0 ]
+
+	name=safe-image
+	CONTAINERS_STORAGE_CONF=$sconf run storage --debug=false create-image --name $name $layer
+	[ "$status" -eq 0 ]
+
+	ctrname=foo
+	CONTAINERS_STORAGE_CONF=$sconf run storage --debug=false create-container --name $ctrname $name
+        [ "$status" -eq 0 ]
+
+	CONTAINERS_STORAGE_CONF=$sconf run storage --debug=false mount $ctrname
+	[ "$status" -eq 0 ]
+	mount="$output"
+
+	for i in file1 file2 file3 ; do
+		run cmp $SRC/$i $mount/$i
+		[ "$status" -eq 0 ]
+	done
+}