diff --git a/WATCHLISTS b/WATCHLISTS
index a3eb24f065..021be1f710 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -104,6 +104,9 @@
     'trap-handler': {
       'filepath': 'src/trap-handler/',
     },
+    'tests': {
+      'filepath': 'test/',
+    },
   },
 
   'WATCHLISTS': {
@@ -177,5 +180,8 @@
       'mark@chromium.org',
       'mseaborn@chromium.org',
     ],
+    'tests': [
+      'almuthanna+watch@chromium.org',
+    ],
   },
 }