diff --git a/source/dnode/mgmt/impl/test/CMakeLists.txt b/source/dnode/mgmt/impl/test/CMakeLists.txt
index b0596bed08..b36cdbd690 100644
--- a/source/dnode/mgmt/impl/test/CMakeLists.txt
+++ b/source/dnode/mgmt/impl/test/CMakeLists.txt
@@ -1,6 +1,5 @@
 enable_testing()
 
-add_subdirectory(acct)
 # add_subdirectory(auth)
 # add_subdirectory(balance)
 add_subdirectory(cluster)
@@ -17,7 +16,6 @@ add_subdirectory(stb)
 # add_subdirectory(sync)
 # add_subdirectory(telem)
 # add_subdirectory(trans)
-add_subdirectory(user)
 add_subdirectory(vgroup)
 
 add_subdirectory(sut)
diff --git a/source/dnode/mnode/impl/CMakeLists.txt b/source/dnode/mnode/impl/CMakeLists.txt
index 6768651922..adbef3b55f 100644
--- a/source/dnode/mnode/impl/CMakeLists.txt
+++ b/source/dnode/mnode/impl/CMakeLists.txt
@@ -12,4 +12,8 @@ target_link_libraries(
     PRIVATE transport
     PRIVATE cjson
     PRIVATE sync
-)
\ No newline at end of file
+)
+
+if(${BUILD_TEST})
+    add_subdirectory(test)
+endif(${BUILD_TEST})
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/test/CMakeLists.txt b/source/dnode/mnode/impl/test/CMakeLists.txt
new file mode 100644
index 0000000000..fa7b45f988
--- /dev/null
+++ b/source/dnode/mnode/impl/test/CMakeLists.txt
@@ -0,0 +1,4 @@
+enable_testing()
+
+add_subdirectory(acct)
+add_subdirectory(user)
diff --git a/source/dnode/mgmt/impl/test/acct/CMakeLists.txt b/source/dnode/mnode/impl/test/acct/CMakeLists.txt
similarity index 100%
rename from source/dnode/mgmt/impl/test/acct/CMakeLists.txt
rename to source/dnode/mnode/impl/test/acct/CMakeLists.txt
diff --git a/source/dnode/mgmt/impl/test/acct/acct.cpp b/source/dnode/mnode/impl/test/acct/acct.cpp
similarity index 100%
rename from source/dnode/mgmt/impl/test/acct/acct.cpp
rename to source/dnode/mnode/impl/test/acct/acct.cpp
diff --git a/source/dnode/mnode/impl/test/mnodeTests.cpp b/source/dnode/mnode/impl/test/mnodeTests.cpp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/source/dnode/mgmt/impl/test/user/CMakeLists.txt b/source/dnode/mnode/impl/test/user/CMakeLists.txt
similarity index 100%
rename from source/dnode/mgmt/impl/test/user/CMakeLists.txt
rename to source/dnode/mnode/impl/test/user/CMakeLists.txt
diff --git a/source/dnode/mgmt/impl/test/user/user.cpp b/source/dnode/mnode/impl/test/user/user.cpp
similarity index 100%
rename from source/dnode/mgmt/impl/test/user/user.cpp
rename to source/dnode/mnode/impl/test/user/user.cpp