diff --git a/test/unit/lib/bdev/bdev_raid.c/Makefile b/test/unit/lib/bdev/bdev_raid.c/Makefile
index 239f72187..9739cb44c 100644
--- a/test/unit/lib/bdev/bdev_raid.c/Makefile
+++ b/test/unit/lib/bdev/bdev_raid.c/Makefile
@@ -35,22 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = log
+TEST_FILE = bdev_raid_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = bdev_raid_ut
-C_SRCS = bdev_raid_ut.c
-
-all: $(APP)
-
-$(APP): $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
index 32262c1fc..7720d5f54 100644
--- a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
+++ b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
@@ -35,8 +35,8 @@
 #include "spdk_cunit.h"
 #include "spdk/env.h"
 #include "spdk_internal/mock.h"
-#include "raid/bdev_raid.c"
-#include "raid/bdev_raid_rpc.c"
+#include "bdev/raid/bdev_raid.c"
+#include "bdev/raid/bdev_raid_rpc.c"
 
 #define MAX_BASE_DRIVES 255
 #define MAX_RAIDS 31