diff --git a/autotest.sh b/autotest.sh
index 09cead183a..a5f5d93838 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -253,6 +253,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 			run_test "nvmf_tcp" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT
 			run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh
 			run_test "nvmf_identify_passthru" test/nvmf/target/identify_passthru.sh --transport=$SPDK_TEST_NVMF_TRANSPORT
+			run_test "nvmf_dif" test/nvmf/target/dif.sh
 		elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "fc" ]; then
 			run_test "nvmf_fc" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT
 			run_test "spdkcli_nvmf_fc" ./test/spdkcli/nvmf.sh
diff --git a/test/nvmf/target/dif.sh b/test/nvmf/target/dif.sh
new file mode 100755
index 0000000000..d21f9ba238
--- /dev/null
+++ b/test/nvmf/target/dif.sh
@@ -0,0 +1,129 @@
+#!/usr/bin/env bash
+testdir=$(readlink -f "$(dirname "$0")")
+rootdir=$(readlink -f "$testdir/../../../")
+
+# Have proper defaults in place
+set -- "--transport=tcp" "--iso" "$@"
+
+source "$rootdir/test/common/autotest_common.sh"
+source "$rootdir/test/nvmf/common.sh"
+
+NULL_META=16 NULL_BLOCK_SIZE=$((512 + NULL_META)) NULL_SIZE=64 NULL_DIF=1
+
+create_subsystem() {
+	local sub_id=${1:-0}
+
+	# Make sure NQN matches what's used in gen_nvmf_target_json()
+	rpc_cmd bdev_null_create "bdev_null$sub_id" "$NULL_SIZE" "$NULL_BLOCK_SIZE" --md-size "$NULL_META" --dif-type "$NULL_DIF"
+	rpc_cmd nvmf_subsystem_create "nqn.2016-06.io.spdk:cnode$sub_id" --serial-number "53313233-$sub_id" --allow-any-host
+	rpc_cmd nvmf_subsystem_add_ns "nqn.2016-06.io.spdk:cnode$sub_id" "bdev_null$sub_id"
+	rpc_cmd nvmf_subsystem_add_listener "nqn.2016-06.io.spdk:cnode$sub_id" -t "$TEST_TRANSPORT" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
+}
+
+create_subsystems() {
+	local sub
+
+	for sub; do
+		create_subsystem "$sub"
+	done
+}
+
+destroy_subsystem() {
+	local sub_id=${1:-0}
+
+	rpc_cmd nvmf_delete_subsystem "nqn.2016-06.io.spdk:cnode$sub_id"
+	rpc_cmd bdev_null_delete "bdev_null$sub_id"
+}
+
+destroy_subsystems() {
+	local sub
+
+	for sub; do
+		destroy_subsystem "$sub"
+	done
+}
+
+create_transport() { rpc_cmd nvmf_create_transport $NVMF_TRANSPORT_OPTS; }
+create_json_sub_conf() { gen_nvmf_target_json "$@"; }
+
+gen_fio_conf() {
+	local file
+
+	cat <<- FIO
+		[global]
+		thread=1
+		direct=1
+		rw=randread
+		ramp_time=0
+		norandommap=1
+		time_based=1
+		bs=${bs:-4k}
+		numjobs=${numjobs:-1}
+		runtime=${runtime:-10}
+
+		[filename0]
+		filename=Nvme${nvme:-0}n1
+		iodepth=${iodepth:-4}
+	FIO
+	for ((file = 1; file <= files; file++)); do
+		cat <<- FIO
+			[filename$file]
+			filename=Nvme${file}n1
+			iodepth=${iodepth:-4}
+		FIO
+	done
+}
+
+fio() {
+	fio_bdev --ioengine=spdk_bdev --spdk_json_conf "$@" <(gen_fio_conf)
+}
+
+fio_dif_1() {
+	create_subsystems 0
+	fio <(create_json_sub_conf 0)
+	destroy_subsystems 0
+}
+
+fio_dif_1_multi_subsystems() {
+	local files=1
+
+	create_subsystems 0 1
+	fio <(create_json_sub_conf 0 1)
+	destroy_subsystems 0 1
+}
+
+fio_dif_rand_params() {
+	local NULL_DIF
+	local bs numjobs runtime iodepth files
+
+	NULL_DIF=3 bs=128k numjobs=3 iodepth=3 runtime=5
+
+	create_subsystems 0
+	fio <(create_json_sub_conf 0)
+	destroy_subsystems 0
+
+	NULL_DIF=2 bs=4k numjobs=8 iodepth=16 runtime="" files=2
+
+	create_subsystems 0 1 2
+	fio <(create_json_sub_conf 0 1 2)
+	destroy_subsystems 0 1 2
+
+	NULL_DIF=1 bs=8k,16k,128k numjobs=2 iodepth=8 runtime=5 files=1
+
+	create_subsystems 0 1
+	fio <(create_json_sub_conf 0 1)
+	destroy_subsystems 0 1
+}
+
+nvmftestinit
+NVMF_TRANSPORT_OPTS+=" --dif-insert-or-strip"
+nvmfappstart
+
+create_transport
+
+run_test "fio_dif_1_default" fio_dif_1
+run_test "fio_dif_1_multi_subsystems" fio_dif_1_multi_subsystems
+run_test "fio_dif_rand_params" fio_dif_rand_params
+
+trap - SIGINT SIGTERM EXIT
+nvmftestfini