diff --git a/TEST_MAPPING b/TEST_MAPPING
index cc413b4..e2cf9a5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
@@ -98,3 +100,5 @@
     }
   ]
 }
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
diff --git a/apkdmverity/TEST_MAPPING b/apkdmverity/TEST_MAPPING
index 89750a8..e2e1a64 100644
--- a/apkdmverity/TEST_MAPPING
+++ b/apkdmverity/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-postsubmit" : [
     {
diff --git a/authfs/TEST_MAPPING b/authfs/TEST_MAPPING
index 450f133..62bc18f 100644
--- a/authfs/TEST_MAPPING
+++ b/authfs/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/encryptedstore/TEST_MAPPING b/encryptedstore/TEST_MAPPING
index a9e1d87..cc1d0c8 100644
--- a/encryptedstore/TEST_MAPPING
+++ b/encryptedstore/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/libs/apexutil/TEST_MAPPING b/libs/apexutil/TEST_MAPPING
index f66a400..73848d3 100644
--- a/libs/apexutil/TEST_MAPPING
+++ b/libs/apexutil/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/libs/apkverify/TEST_MAPPING b/libs/apkverify/TEST_MAPPING
index 7224fc7..6bbc624 100644
--- a/libs/apkverify/TEST_MAPPING
+++ b/libs/apkverify/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/libs/avb/TEST_MAPPING b/libs/avb/TEST_MAPPING
index 2f4bccc..57de6b3 100644
--- a/libs/avb/TEST_MAPPING
+++ b/libs/avb/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/libs/capabilities/TEST_MAPPING b/libs/capabilities/TEST_MAPPING
index 568a771..902c6e5 100644
--- a/libs/capabilities/TEST_MAPPING
+++ b/libs/capabilities/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/libs/devicemapper/TEST_MAPPING b/libs/devicemapper/TEST_MAPPING
index 23d10c4..cbe7442 100644
--- a/libs/devicemapper/TEST_MAPPING
+++ b/libs/devicemapper/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/libs/fdtpci/TEST_MAPPING b/libs/fdtpci/TEST_MAPPING
index c315b4a..192a7c6 100644
--- a/libs/fdtpci/TEST_MAPPING
+++ b/libs/fdtpci/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/libs/libfdt/TEST_MAPPING b/libs/libfdt/TEST_MAPPING
index 596f84b..e2f8dbb 100644
--- a/libs/libfdt/TEST_MAPPING
+++ b/libs/libfdt/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/libs/vbmeta/TEST_MAPPING b/libs/vbmeta/TEST_MAPPING
index e42aea0..92016c7 100644
--- a/libs/vbmeta/TEST_MAPPING
+++ b/libs/vbmeta/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/microdroid_manager/TEST_MAPPING b/microdroid_manager/TEST_MAPPING
index af0abe7..5f4c33c 100644
--- a/microdroid_manager/TEST_MAPPING
+++ b/microdroid_manager/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
diff --git a/pvmfw/TEST_MAPPING b/pvmfw/TEST_MAPPING
index e4a80dc..d77e651 100644
--- a/pvmfw/TEST_MAPPING
+++ b/pvmfw/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {
@@ -7,4 +9,4 @@
       "name" : "libpvmfw.bootargs.test"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/rialto/TEST_MAPPING b/rialto/TEST_MAPPING
index 88f616e..e8e84d2 100644
--- a/rialto/TEST_MAPPING
+++ b/rialto/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/virtualizationmanager/TEST_MAPPING b/virtualizationmanager/TEST_MAPPING
index a680f6d..cc24ef5 100644
--- a/virtualizationmanager/TEST_MAPPING
+++ b/virtualizationmanager/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/vm/TEST_MAPPING b/vm/TEST_MAPPING
index 485c3af..f1f48a6 100644
--- a/vm/TEST_MAPPING
+++ b/vm/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/vmbase/TEST_MAPPING b/vmbase/TEST_MAPPING
index c315b4a..192a7c6 100644
--- a/vmbase/TEST_MAPPING
+++ b/vmbase/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit": [
     {
diff --git a/zipfuse/TEST_MAPPING b/zipfuse/TEST_MAPPING
index 13055f0..8ee4d7f 100644
--- a/zipfuse/TEST_MAPPING
+++ b/zipfuse/TEST_MAPPING
@@ -1,3 +1,5 @@
+// When adding or removing tests here, don't forget to amend _all_modules list in
+// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
 {
   "avf-presubmit" : [
     {