diff --git a/autotest.sh b/autotest.sh
index 1cb29dafc..9a8a2a255 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -184,6 +184,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 			run_test "nvme_cuse" test/nvme/cuse/nvme_cuse.sh
 			run_test "nvme_cli_cuse" test/nvme/spdk_nvme_cli_cuse.sh
 			run_test "nvme_smartctl_cuse" test/nvme/spdk_smartctl_cuse.sh
+			run_test "nvme_ns_manage_cuse" test/nvme/nvme_ns_manage_cuse.sh
 			rmmod cuse
 		fi
 		run_test "nvme_rpc" test/nvme/nvme_rpc.sh
diff --git a/test/nvme/nvme_ns_manage_cuse.sh b/test/nvme/nvme_ns_manage_cuse.sh
new file mode 100755
index 000000000..9447dae7e
--- /dev/null
+++ b/test/nvme/nvme_ns_manage_cuse.sh
@@ -0,0 +1,149 @@
+#!/usr/bin/env bash
+
+testdir=$(readlink -f $(dirname $0))
+rootdir=$(readlink -f $testdir/../..)
+source $rootdir/scripts/common.sh
+source $rootdir/test/common/autotest_common.sh
+
+NVME_CMD="/usr/local/src/nvme-cli/nvme"
+
+rpc_py=$rootdir/scripts/rpc.py
+
+$rootdir/scripts/setup.sh
+sleep 1
+
+bdfs=$(get_nvme_bdfs)
+
+$rootdir/scripts/setup.sh reset
+sleep 1
+
+for bdf in $bdfs; do
+	# get_nvme_name_from_bdf returns namespace device.
+	# We need here controller.
+	bdf_sysfs_path=$(readlink -f /sys/class/nvme/nvme* | grep "$bdf/nvme/nvme")
+	if [ -z "$bdf_sysfs_path" ]; then
+		continue
+	fi
+	nvme_name=$(basename $bdf_sysfs_path)
+
+	oacs=$($NVME_CMD id-ctrl /dev/${nvme_name} | grep oacs | cut -d: -f2)
+	oacs_ns_manage=$((oacs & 0x8))
+	oaes=$($NVME_CMD id-ctrl /dev/${nvme_name} | grep oaes | cut -d: -f2)
+	aer_ns_change=$((oaes & 0x100))
+
+	if [[ "$oacs_ns_manage" -ne 0 ]] && [[ "$aer_ns_change" -ne 0 ]]; then
+		break
+	fi
+done
+
+if [[ "${nvme_name}" == "" ]] || [[ "$oacs_ns_manage" -eq 0 ]] || [[ "$aer_ns_change" -eq 0 ]]; then
+	# This version doesn't support devices without supported
+	# NS Change AER. It will be included in the next patch.
+	echo "NVMe device not found"
+	$rootdir/scripts/setup.sh
+	exit 0
+fi
+
+nvme_dev=/dev/${nvme_name}
+
+# Detect supported features and configuration
+nvmcap=$($NVME_CMD id-ns ${nvme_dev} -n 1 | grep nvmcap | cut -d: -f2)
+blksize=512
+
+function clean_up() {
+	$rootdir/scripts/setup.sh reset
+
+	size=$((nvmcap / blksize))
+
+	echo "Restoring $nvme_dev..."
+	$NVME_CMD detach-ns ${nvme_dev} -n 0xffffffff -c 0 || true
+	$NVME_CMD delete-ns ${nvme_dev} -n 0xffffffff || true
+	$NVME_CMD create-ns ${nvme_dev} -s ${size} -c ${size} -f 0
+	$NVME_CMD attach-ns ${nvme_dev} -n 1 -c 0
+	$NVME_CMD reset ${nvme_dev}
+
+	$rootdir/scripts/setup.sh
+}
+
+function info_print() {
+	echo "---"
+	echo "$@"
+	echo "---"
+}
+
+# Prepare controller
+info_print "delete all namespaces"
+$NVME_CMD detach-ns ${nvme_dev} -n 0xffffffff -c 0 || true
+$NVME_CMD delete-ns ${nvme_dev} -n 0xffffffff || true
+
+sleep 1
+
+PCI_WHITELIST="${bdf}" $rootdir/scripts/setup.sh
+
+$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 &
+spdk_tgt_pid=$!
+trap 'kill -9 ${spdk_tgt_pid}; clean_up; exit 1' SIGINT SIGTERM EXIT
+
+waitforlisten $spdk_tgt_pid
+
+$rpc_py bdev_nvme_attach_controller -b Nvme0 -t PCIe -a ${bdf}
+$rpc_py bdev_nvme_cuse_register -n Nvme0
+
+sleep 1
+[[ -c /dev/spdk/nvme0 ]]
+
+for dev in /dev/spdk/nvme0n*; do
+	[[ ! -c ${dev} ]]
+done
+
+info_print "create ns: nsze=10000 ncap=10000 flbias=0"
+$NVME_CMD create-ns /dev/spdk/nvme0 -s 10000 -c 10000 -f 0
+
+info_print "attach ns: nsid=1 controller=0"
+$NVME_CMD attach-ns /dev/spdk/nvme0 -n 1 -c 0
+
+sleep 1
+
+[[ -c /dev/spdk/nvme0n1 ]]
+
+info_print "create ns: nsze=10000 ncap=10000 flbias=0"
+$NVME_CMD create-ns /dev/spdk/nvme0 -s 10000 -c 10000 -f 0
+
+info_print "attach ns: nsid=2 controller=0"
+$NVME_CMD attach-ns /dev/spdk/nvme0 -n 2 -c 0
+
+sleep 1
+
+[[ -c /dev/spdk/nvme0n2 ]]
+
+info_print "detach ns: nsid=2 controller=0"
+$NVME_CMD detach-ns /dev/spdk/nvme0 -n 2 -c 0 || true
+
+info_print "delete ns: nsid=2"
+$NVME_CMD delete-ns /dev/spdk/nvme0 -n 2 || true
+
+sleep 1
+
+[[ ! -c /dev/spdk/nvme0n2 ]]
+
+info_print "detach ns: nsid=1 controller=0"
+$NVME_CMD detach-ns /dev/spdk/nvme0 -n 1 -c 0 || true
+
+info_print "delete ns: nsid=1"
+$NVME_CMD delete-ns /dev/spdk/nvme0 -n 1 || true
+
+sleep 1
+
+# Here we should not have any cuse devices
+for dev in /dev/spdk/nvme0n*; do
+	[[ ! -c ${dev} ]]
+done
+
+$rpc_py bdev_nvme_detach_controller Nvme0
+
+sleep 1
+[[ ! -c /dev/spdk/nvme0 ]]
+
+trap - SIGINT SIGTERM EXIT
+killprocess $spdk_tgt_pid
+clean_up