diff --git a/adapter/uhdf2/test/BUILD.gn b/adapter/uhdf2/test/BUILD.gn
index 1650c4b4371ae89400ca4f960b7827afd5c7e83c..e6df9923f95729345b5301ef1daefb1a8ea34858 100644
--- a/adapter/uhdf2/test/BUILD.gn
+++ b/adapter/uhdf2/test/BUILD.gn
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
 declare_args() {
   hdf_core_khdf_test_support = true
   hdf_core_platform_test_support = false
@@ -23,10 +25,6 @@ if (hdf_core_khdf_test_support) {
       "./../../../framework/test/fuzztest:hdf_framework_fuzztest",
       "fuzztest:hdf_platform_test",
       "unittest/config:hdf_adapter_uhdf_test_config",
-      "unittest/load_vdi:hdf_load_vdi_test",
-      "unittest/load_vdi:libvdi_sample1_driver",
-      "unittest/load_vdi:libvdi_sample1_symbol",
-      "unittest/load_vdi:libvdi_sample2_driver",
       "unittest/manager:hdf_adapter_uhdf_test_core_shared",
       "unittest/manager:hdf_adapter_uhdf_test_ioservice",
       "unittest/manager:hdf_adapter_uhdf_test_manager",
@@ -38,6 +36,14 @@ if (hdf_core_khdf_test_support) {
       "unittest/osal:hdf_adapter_uhdf_test_osal_posix",
       "unittest/platform/i2c:ui2c_test",
     ]
+    if (with_sample) {
+      deps += [
+        "unittest/load_vdi:hdf_load_vdi_test",
+        "unittest/load_vdi:libvdi_sample1_driver",
+        "unittest/load_vdi:libvdi_sample1_symbol",
+        "unittest/load_vdi:libvdi_sample2_driver",
+      ]
+    }
     if (hdf_core_platform_test_support) {
       deps += [ "unittest/platform:hdf_adapter_uhdf_test_platform" ]
     }
@@ -48,14 +54,19 @@ if (hdf_core_khdf_test_support) {
     deps = [
       "./../../../framework/test/fuzztest:hdf_framework_fuzztest",
       "fuzztest:hdf_platform_test",
-      "unittest/load_vdi:hdf_load_vdi_test",
-      "unittest/load_vdi:libvdi_sample1_driver",
-      "unittest/load_vdi:libvdi_sample1_symbol",
-      "unittest/load_vdi:libvdi_sample2_driver",
       "unittest/manager:hdf_adapter_uhdf_test_core_shared",
       "unittest/manager:hdf_adapter_uhdf_test_remote_adapter",
       "unittest/manager:hdf_adapter_uhdf_test_sbuf",
       "unittest/osal:hdf_adapter_uhdf_test_osal_posix",
     ]
+
+    if (with_sample) {
+      deps += [
+        "unittest/load_vdi:hdf_load_vdi_test",
+        "unittest/load_vdi:libvdi_sample1_driver",
+        "unittest/load_vdi:libvdi_sample1_symbol",
+        "unittest/load_vdi:libvdi_sample2_driver",
+      ]
+    }
   }
 }