diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index d2a8c13dfe..be220ffaca 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -34,8 +34,9 @@ java_sdk_library {
         // Using for test only
         "//cts/tests/netlegacy22.api",
 
-        // TODO: b/374174952 Remove it when VCN CTS is moved to Connectivity/
+        // TODO: b/374174952 Clean up VCN paths when the code location is finalized
         "//cts/tests/tests/vcn",
+        "//packages/modules/Connectivity/Vcn/tests:__subpackages__",
 
         "//external/sl4a:__subpackages__",
         "//frameworks/base/core/tests/bandwidthtests",
diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index 9d6d3563e3..22ca3b3b6d 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -174,8 +174,9 @@ java_sdk_library {
         "//cts/tests/netlegacy22.api",
         "//cts/tests/tests/app.usage", // NetworkUsageStatsTest
 
-        // TODO: b/374174952 Remove it when VCN CTS is moved to Connectivity/
+        // TODO: b/374174952 Clean up VCN paths when the code location is finalized
         "//cts/tests/tests/vcn",
+        "//packages/modules/Connectivity/Vcn/tests:__subpackages__",
 
         "//external/sl4a:__subpackages__",
         "//frameworks/base/core/tests/bandwidthtests",
diff --git a/framework/Android.bp b/framework/Android.bp
index afecb10a1d..fc84816b84 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -196,8 +196,9 @@ java_sdk_library {
         "//cts/tests/netlegacy22.api",
         "//cts/tests/tests/app.usage", // NetworkUsageStatsTest
 
-        // TODO: b/374174952 Remove it when VCN CTS is moved to Connectivity/
+        // TODO: b/374174952 Clean up VCN paths when the code location is finalized
         "//cts/tests/tests/vcn",
+        "//packages/modules/Connectivity/Vcn/tests:__subpackages__",
 
         "//external/sl4a:__subpackages__",
         "//frameworks/base/core/tests/bandwidthtests",