diff --git a/autotest.sh b/autotest.sh
index deac3d397..84c855b34 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -177,6 +177,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 			run_test "nvme_cli" test/nvme/spdk_nvme_cli.sh
 		fi
 		if [[ $SPDK_TEST_NVME_CUSE -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
 		fi
diff --git a/test/nvme/cuse/nvme_cuse.sh b/test/nvme/cuse/nvme_cuse.sh
new file mode 100755
index 000000000..053932740
--- /dev/null
+++ b/test/nvme/cuse/nvme_cuse.sh
@@ -0,0 +1,49 @@
+#!/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
+
+rpc_py=$rootdir/scripts/rpc.py
+
+bdf=$(get_first_nvme_bdf)
+ctrlr="/dev/spdk/nvme0"
+
+$rootdir/scripts/setup.sh
+
+$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 &
+spdk_tgt_pid=$!
+trap 'kill -9 ${spdk_tgt_pid}; 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 5
+
+if [ ! -c "$ctrlr" ]; then
+	exit 1
+fi
+
+$rpc_py bdev_get_bdevs
+$rpc_py bdev_nvme_get_controllers
+
+$rpc_py bdev_nvme_cuse_unregister -n Nvme0
+sleep 1
+if [ -c "$ctrlr" ]; then
+	exit 1
+fi
+
+$rpc_py bdev_nvme_cuse_register -n Nvme0
+sleep 1
+
+if [ ! -c "$ctrlr" ]; then
+	exit 1
+fi
+
+$rpc_py bdev_nvme_detach_controller Nvme0
+
+trap - SIGINT SIGTERM EXIT
+killprocess $spdk_tgt_pid
diff --git a/test/nvme/spdk_nvme_cli_cuse.sh b/test/nvme/spdk_nvme_cli_cuse.sh
index 53d24d6a6..3edf422a4 100755
--- a/test/nvme/spdk_nvme_cli_cuse.sh
+++ b/test/nvme/spdk_nvme_cli_cuse.sh
@@ -104,24 +104,5 @@ if [ ! -c "$ctrlr" ]; then
 	return 1
 fi
 
-$rpc_py bdev_nvme_cuse_unregister -n Nvme0
-sleep 1
-if [ -c "$ctrlr" ]; then
-	return 1
-fi
-
-$rpc_py bdev_nvme_cuse_register -n Nvme0
-sleep 1
-
-if [ ! -c "$ctrlr" ]; then
-	return 1
-fi
-
-$rpc_py bdev_nvme_detach_controller Nvme0
-sleep 1
-if [ -c "$ctrlr" ]; then
-	return 1
-fi
-
 trap - SIGINT SIGTERM EXIT
 killprocess $spdk_tgt_pid