diff --git a/CODEOWNERS b/CODEOWNERS
index 11eefbb397a..054bd817131 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -46,6 +46,11 @@
 # related to Github Actions
 /.github/ @seemethere @janeyx99 @atalman
 
+# Custom Test Infrastructure
+/test/run_test.py @pytorch-dev-infra
+/torch/testing/_internal/common_device_type.py @mruberry
+/torch/testing/_internal/common_utils.py @pytorch-dev-infra
+
 # Parametrizations
 /torch/nn/utils/parametriz*.py @lezcano