diff --git a/BUILD.gn b/BUILD.gn
index cab89629c627888db43df4869e3cb9b2163df9f6..25edab3f8b969f04a6d4791c087c18b8200545c2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,31 +23,4 @@ group("crypto_framework_component") {
       "plugin:crypto_openssl_plugin_lib",
     ]
   }
-}
-
-group("crypto_framework_test") {
-  testonly = true
-  if (os_level == "standard") {
-    deps = [ "test/unittest:crypto_framework_test" ]
-  }
-}
-
-group("crypto_framework_fuzztest") {
-  testonly = true
-  deps = []
-  if (os_level == "standard") {
-    deps += [
-      "test/fuzztest/crypto_operation/hcfciphercreate_fuzzer:fuzztest",
-      "test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer:fuzztest",
-      "test/fuzztest/crypto_operation/hcfmaccreate_fuzzer:fuzztest",
-      "test/fuzztest/crypto_operation/hcfmdcreate_fuzzer:fuzztest",
-      "test/fuzztest/crypto_operation/hcfsigncreate_fuzzer:fuzztest",
-      "test/fuzztest/crypto_operation/hcfverifycreate_fuzzer:fuzztest",
-      "test/fuzztest/key/asykeygenerator_fuzzer:fuzztest",
-      "test/fuzztest/key/dhkeyutil_fuzzer:fuzztest",
-      "test/fuzztest/key/ecckeyutil_fuzzer:fuzztest",
-      "test/fuzztest/key/symkeygenerator_fuzzer:fuzztest",
-      "test/fuzztest/rand/hcfrandcreate_fuzzer:fuzztest",
-    ]
-  }
-}
+}
\ No newline at end of file
diff --git a/bundle.json b/bundle.json
index 66b071df07e99ab7fbb261cadac4c93e6ef69728..a03233287259e98741f7d909db4613e93563b9ce 100644
--- a/bundle.json
+++ b/bundle.json
@@ -80,8 +80,8 @@
           }
         ],
         "test": [
-            "//base/security/crypto_framework:crypto_framework_test",
-            "//base/security/crypto_framework:crypto_framework_fuzztest"
+            "//base/security/crypto_framework/test:crypto_framework_test",
+            "//base/security/crypto_framework/test:crypto_framework_fuzztest"
         ]
       }
     }
diff --git a/test/BUILD.gn b/test/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..64613358d6b3ce98c58a82de33a3b961e32d3ec4
--- /dev/null
+++ b/test/BUILD.gn
@@ -0,0 +1,43 @@
+# Copyright (C) 2024 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  crypto_framework_enabled = true
+}
+
+group("crypto_framework_test") {
+  testonly = true
+  if (os_level == "standard") {
+    deps = [ "test/unittest:crypto_framework_test" ]
+  }
+}
+
+group("crypto_framework_fuzztest") {
+  testonly = true
+  deps = []
+  if (os_level == "standard") {
+    deps += [
+      "test/fuzztest/crypto_operation/hcfciphercreate_fuzzer:fuzztest",
+      "test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer:fuzztest",
+      "test/fuzztest/crypto_operation/hcfmaccreate_fuzzer:fuzztest",
+      "test/fuzztest/crypto_operation/hcfmdcreate_fuzzer:fuzztest",
+      "test/fuzztest/crypto_operation/hcfsigncreate_fuzzer:fuzztest",
+      "test/fuzztest/crypto_operation/hcfverifycreate_fuzzer:fuzztest",
+      "test/fuzztest/key/asykeygenerator_fuzzer:fuzztest",
+      "test/fuzztest/key/dhkeyutil_fuzzer:fuzztest",
+      "test/fuzztest/key/ecckeyutil_fuzzer:fuzztest",
+      "test/fuzztest/key/symkeygenerator_fuzzer:fuzztest",
+      "test/fuzztest/rand/hcfrandcreate_fuzzer:fuzztest",
+    ]
+  }
+}