diff --git a/BUILD.gn b/BUILD.gn
index 2c4fca7..d79a0b7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -33,32 +33,22 @@
     "//test/arch(:qemu_aarch64_clang)",
     "//test/arch(:qemu_aarch64_vhe_clang)",
     "//test/arch(:rpi4_clang)",
-    "//test/arch(:secure_aem_v8a_fvp_clang)",
-    "//test/arch(:secure_aem_v8a_fvp_vhe_clang)",
-    "//test/arch(:secure_tc_clang)",
     "//test/linux(:aem_v8a_fvp_vhe_vm_clang)",
     "//test/linux(:aem_v8a_fvp_vm_clang)",
     "//test/linux(:qemu_aarch64_vhe_vm_clang)",
     "//test/linux(:qemu_aarch64_vm_clang)",
     "//test/linux(:rpi4_vm_clang)",
-    "//test/linux(:secure_aem_v8a_fvp_vhe_vm_clang)",
-    "//test/linux(:secure_aem_v8a_fvp_vm_clang)",
-    "//test/linux(:secure_tc_vm_clang)",
+    "//test/vmapi:partitions(:secure_aem_v8a_fvp_vhe_vm_clang)",
+    "//test/vmapi:partitions(:secure_aem_v8a_fvp_vm_clang)",
     "//test/vmapi(:aem_v8a_fvp_vhe_vm_clang)",
     "//test/vmapi(:aem_v8a_fvp_vm_clang)",
     "//test/vmapi(:qemu_aarch64_vhe_vm_clang)",
     "//test/vmapi(:qemu_aarch64_vm_clang)",
     "//test/vmapi(:rpi4_vm_clang)",
-    "//test/vmapi(:secure_aem_v8a_fvp_vhe_vm_clang)",
-    "//test/vmapi(:secure_aem_v8a_fvp_vm_clang)",
-    "//test/vmapi(:secure_tc_vm_clang)",
     "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:aem_v8a_fvp_vhe_vm_clang)",
     "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:aem_v8a_fvp_vm_clang)",
     "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:qemu_aarch64_vhe_vm_clang)",
     "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:qemu_aarch64_vm_clang)",
-    "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:secure_aem_v8a_fvp_vhe_vm_clang)",
-    "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:secure_aem_v8a_fvp_vm_clang)",
-    "//test/vmapi/arch/aarch64/gicv3:gicv3_test(:secure_tc_vm_clang)",
   ]
 }