diff --git a/.github/scripts/lint_test_ownership.py b/.github/scripts/lint_test_ownership.py
index 052f4c88c9a..270019c0f56 100755
--- a/.github/scripts/lint_test_ownership.py
+++ b/.github/scripts/lint_test_ownership.py
@@ -22,7 +22,7 @@ from typing import List, Any
 # Team/owner labels usually start with "module: " or "oncall: ", but the following are acceptable exceptions
 ACCEPTABLE_OWNER_LABELS = ["NNC", "high priority"]
 GLOB_EXCEPTIONS = [
-    "test/run_test.py"
+    "**/test/run_test.py"
 ]
 
 PYTORCH_ROOT = Path(__file__).resolve().parent.parent.parent
@@ -35,7 +35,7 @@ S3_RESOURCE_READ_ONLY = boto3.resource("s3", config=botocore.config.Config(signa
 def get_all_test_files() -> List[Path]:
     test_files = list(TEST_DIR.glob("**/test_*.py"))
     test_files.extend(list(TEST_DIR.glob("**/*_test.py")))
-    return [f for f in test_files if any([fnmatch.fnmatch(str(f), g) for g in GLOB_EXCEPTIONS])]
+    return [f for f in test_files if not any([fnmatch.fnmatch(str(f), g) for g in GLOB_EXCEPTIONS])]
 
 
 def get_pytorch_labels() -> Any:
diff --git a/test/fx2trt/converters/acc_op/test_adaptive_avgpool.py b/test/fx2trt/converters/acc_op/test_adaptive_avgpool.py
index 00bc618ae94..bf717fb4bbb 100644
--- a/test/fx2trt/converters/acc_op/test_adaptive_avgpool.py
+++ b/test/fx2trt/converters/acc_op/test_adaptive_avgpool.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_avgpool.py b/test/fx2trt/converters/acc_op/test_avgpool.py
index 597b909760a..5fba084bc48 100644
--- a/test/fx2trt/converters/acc_op/test_avgpool.py
+++ b/test/fx2trt/converters/acc_op/test_avgpool.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_batchnorm.py b/test/fx2trt/converters/acc_op/test_batchnorm.py
index 61ab9a28718..f7627f7cc6b 100644
--- a/test/fx2trt/converters/acc_op/test_batchnorm.py
+++ b/test/fx2trt/converters/acc_op/test_batchnorm.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_binary_ops.py b/test/fx2trt/converters/acc_op/test_binary_ops.py
index 348fac661f3..b3b7937c198 100644
--- a/test/fx2trt/converters/acc_op/test_binary_ops.py
+++ b/test/fx2trt/converters/acc_op/test_binary_ops.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 from typing import Callable
 
diff --git a/test/fx2trt/converters/acc_op/test_cat.py b/test/fx2trt/converters/acc_op/test_cat.py
index 6ecb84adfa5..87ac5e25b20 100644
--- a/test/fx2trt/converters/acc_op/test_cat.py
+++ b/test/fx2trt/converters/acc_op/test_cat.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_chunk.py b/test/fx2trt/converters/acc_op/test_chunk.py
index 47cb9beb898..fd4811184a9 100644
--- a/test/fx2trt/converters/acc_op/test_chunk.py
+++ b/test/fx2trt/converters/acc_op/test_chunk.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 import torch.nn as nn
diff --git a/test/fx2trt/converters/acc_op/test_clamp.py b/test/fx2trt/converters/acc_op/test_clamp.py
index e9be71edd7f..b76155c1759 100644
--- a/test/fx2trt/converters/acc_op/test_clamp.py
+++ b/test/fx2trt/converters/acc_op/test_clamp.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_convolution.py b/test/fx2trt/converters/acc_op/test_convolution.py
index 4d0f828c9d1..7a0dffcfd06 100644
--- a/test/fx2trt/converters/acc_op/test_convolution.py
+++ b/test/fx2trt/converters/acc_op/test_convolution.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_dequantize.py b/test/fx2trt/converters/acc_op/test_dequantize.py
index 91e6f9b4b67..998f0bbf329 100644
--- a/test/fx2trt/converters/acc_op/test_dequantize.py
+++ b/test/fx2trt/converters/acc_op/test_dequantize.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import unittest
 
diff --git a/test/fx2trt/converters/acc_op/test_elu.py b/test/fx2trt/converters/acc_op/test_elu.py
index 15da127a5ba..c68d41de155 100644
--- a/test/fx2trt/converters/acc_op/test_elu.py
+++ b/test/fx2trt/converters/acc_op/test_elu.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_flatten.py b/test/fx2trt/converters/acc_op/test_flatten.py
index a4505166946..a26309646bf 100644
--- a/test/fx2trt/converters/acc_op/test_flatten.py
+++ b/test/fx2trt/converters/acc_op/test_flatten.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_gelu.py b/test/fx2trt/converters/acc_op/test_gelu.py
index 8b1534f887e..92cb116166e 100644
--- a/test/fx2trt/converters/acc_op/test_gelu.py
+++ b/test/fx2trt/converters/acc_op/test_gelu.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 import torch.nn as nn
diff --git a/test/fx2trt/converters/acc_op/test_getitem.py b/test/fx2trt/converters/acc_op/test_getitem.py
index 3fb972c5952..3f2308fb875 100644
--- a/test/fx2trt/converters/acc_op/test_getitem.py
+++ b/test/fx2trt/converters/acc_op/test_getitem.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_hard_sigmoid.py b/test/fx2trt/converters/acc_op/test_hard_sigmoid.py
index 1be6effa3b5..284b96b9826 100644
--- a/test/fx2trt/converters/acc_op/test_hard_sigmoid.py
+++ b/test/fx2trt/converters/acc_op/test_hard_sigmoid.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 from torch.testing._internal.common_fx2trt import InputTensorSpec, AccTestCase
 from torch import nn
 from torch.fx.experimental.fx_acc import acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_hardtanh.py b/test/fx2trt/converters/acc_op/test_hardtanh.py
index e348390a0ca..15c607025ec 100644
--- a/test/fx2trt/converters/acc_op/test_hardtanh.py
+++ b/test/fx2trt/converters/acc_op/test_hardtanh.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_layernorm.py b/test/fx2trt/converters/acc_op/test_layernorm.py
index dec8e9a8347..3e90086f43d 100644
--- a/test/fx2trt/converters/acc_op/test_layernorm.py
+++ b/test/fx2trt/converters/acc_op/test_layernorm.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_leaky_relu.py b/test/fx2trt/converters/acc_op/test_leaky_relu.py
index fdc1ae58ee6..0ce3ded3ff4 100644
--- a/test/fx2trt/converters/acc_op/test_leaky_relu.py
+++ b/test/fx2trt/converters/acc_op/test_leaky_relu.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_linear.py b/test/fx2trt/converters/acc_op/test_linear.py
index 738dacd54f7..5d34ac6ecce 100644
--- a/test/fx2trt/converters/acc_op/test_linear.py
+++ b/test/fx2trt/converters/acc_op/test_linear.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_matmul.py b/test/fx2trt/converters/acc_op/test_matmul.py
index 7235f6cb721..6ba49c42dc0 100644
--- a/test/fx2trt/converters/acc_op/test_matmul.py
+++ b/test/fx2trt/converters/acc_op/test_matmul.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_max.py b/test/fx2trt/converters/acc_op/test_max.py
index 2cc33293d39..764b8ede06c 100644
--- a/test/fx2trt/converters/acc_op/test_max.py
+++ b/test/fx2trt/converters/acc_op/test_max.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_maximum.py b/test/fx2trt/converters/acc_op/test_maximum.py
index 4b00302666c..a8c2881f010 100644
--- a/test/fx2trt/converters/acc_op/test_maximum.py
+++ b/test/fx2trt/converters/acc_op/test_maximum.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_maxpool.py b/test/fx2trt/converters/acc_op/test_maxpool.py
index d3d79d689f0..b73ef2d854f 100644
--- a/test/fx2trt/converters/acc_op/test_maxpool.py
+++ b/test/fx2trt/converters/acc_op/test_maxpool.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_min.py b/test/fx2trt/converters/acc_op/test_min.py
index 018529d1c01..7dc5f95c9c4 100644
--- a/test/fx2trt/converters/acc_op/test_min.py
+++ b/test/fx2trt/converters/acc_op/test_min.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_minimum.py b/test/fx2trt/converters/acc_op/test_minimum.py
index a4a7f9a1a45..38b8950bc17 100644
--- a/test/fx2trt/converters/acc_op/test_minimum.py
+++ b/test/fx2trt/converters/acc_op/test_minimum.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_narrow.py b/test/fx2trt/converters/acc_op/test_narrow.py
index dddf3ff4a60..4958b5fbdf6 100644
--- a/test/fx2trt/converters/acc_op/test_narrow.py
+++ b/test/fx2trt/converters/acc_op/test_narrow.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_pad.py b/test/fx2trt/converters/acc_op/test_pad.py
index 5b8bf1c5de5..9afe0b6b5b0 100644
--- a/test/fx2trt/converters/acc_op/test_pad.py
+++ b/test/fx2trt/converters/acc_op/test_pad.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_permute.py b/test/fx2trt/converters/acc_op/test_permute.py
index 55a928b96f3..3b98b09cf79 100644
--- a/test/fx2trt/converters/acc_op/test_permute.py
+++ b/test/fx2trt/converters/acc_op/test_permute.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_quantize_per_tensor.py b/test/fx2trt/converters/acc_op/test_quantize_per_tensor.py
index b87589441b1..3dfc7b065b3 100644
--- a/test/fx2trt/converters/acc_op/test_quantize_per_tensor.py
+++ b/test/fx2trt/converters/acc_op/test_quantize_per_tensor.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import unittest
 
diff --git a/test/fx2trt/converters/acc_op/test_reduce_ops.py b/test/fx2trt/converters/acc_op/test_reduce_ops.py
index 7ce3842e2af..6c24be77ed6 100644
--- a/test/fx2trt/converters/acc_op/test_reduce_ops.py
+++ b/test/fx2trt/converters/acc_op/test_reduce_ops.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_relu.py b/test/fx2trt/converters/acc_op/test_relu.py
index 768cc0488f7..1c45c5a1800 100644
--- a/test/fx2trt/converters/acc_op/test_relu.py
+++ b/test/fx2trt/converters/acc_op/test_relu.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_reshape.py b/test/fx2trt/converters/acc_op/test_reshape.py
index f706baba37e..fca71213ad3 100644
--- a/test/fx2trt/converters/acc_op/test_reshape.py
+++ b/test/fx2trt/converters/acc_op/test_reshape.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_selu.py b/test/fx2trt/converters/acc_op/test_selu.py
index 228bb2d8041..e24b64e8181 100644
--- a/test/fx2trt/converters/acc_op/test_selu.py
+++ b/test/fx2trt/converters/acc_op/test_selu.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_sigmoid.py b/test/fx2trt/converters/acc_op/test_sigmoid.py
index 6c16848edaa..1df52ec3712 100644
--- a/test/fx2trt/converters/acc_op/test_sigmoid.py
+++ b/test/fx2trt/converters/acc_op/test_sigmoid.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_silu.py b/test/fx2trt/converters/acc_op/test_silu.py
index 9d1415a10c0..83f8c04b901 100644
--- a/test/fx2trt/converters/acc_op/test_silu.py
+++ b/test/fx2trt/converters/acc_op/test_silu.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 from torch.testing._internal.common_fx2trt import InputTensorSpec, AccTestCase
 from torch import nn
 import torch
diff --git a/test/fx2trt/converters/acc_op/test_size.py b/test/fx2trt/converters/acc_op/test_size.py
index 6ea247d0fa5..e8ae34e7be6 100644
--- a/test/fx2trt/converters/acc_op/test_size.py
+++ b/test/fx2trt/converters/acc_op/test_size.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_softmax.py b/test/fx2trt/converters/acc_op/test_softmax.py
index 50bca2b5fdf..9a6cebe873b 100644
--- a/test/fx2trt/converters/acc_op/test_softmax.py
+++ b/test/fx2trt/converters/acc_op/test_softmax.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_softsign.py b/test/fx2trt/converters/acc_op/test_softsign.py
index 7b94ac3d748..2c0b8d62d26 100644
--- a/test/fx2trt/converters/acc_op/test_softsign.py
+++ b/test/fx2trt/converters/acc_op/test_softsign.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_split.py b/test/fx2trt/converters/acc_op/test_split.py
index 7dd8279352d..fb6f734d071 100644
--- a/test/fx2trt/converters/acc_op/test_split.py
+++ b/test/fx2trt/converters/acc_op/test_split.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_squeeze.py b/test/fx2trt/converters/acc_op/test_squeeze.py
index 1adccf6fb82..0cdcb8416fa 100644
--- a/test/fx2trt/converters/acc_op/test_squeeze.py
+++ b/test/fx2trt/converters/acc_op/test_squeeze.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_tanh.py b/test/fx2trt/converters/acc_op/test_tanh.py
index cfdfbef7369..783a5893fa9 100644
--- a/test/fx2trt/converters/acc_op/test_tanh.py
+++ b/test/fx2trt/converters/acc_op/test_tanh.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_tile.py b/test/fx2trt/converters/acc_op/test_tile.py
index 4507d67d5c4..07d21e79b36 100644
--- a/test/fx2trt/converters/acc_op/test_tile.py
+++ b/test/fx2trt/converters/acc_op/test_tile.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_topk.py b/test/fx2trt/converters/acc_op/test_topk.py
index e5cedfc667e..d04a1bc68b0 100644
--- a/test/fx2trt/converters/acc_op/test_topk.py
+++ b/test/fx2trt/converters/acc_op/test_topk.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
diff --git a/test/fx2trt/converters/acc_op/test_unary_ops.py b/test/fx2trt/converters/acc_op/test_unary_ops.py
index bcf62a4260b..b77c1edcd47 100644
--- a/test/fx2trt/converters/acc_op/test_unary_ops.py
+++ b/test/fx2trt/converters/acc_op/test_unary_ops.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 from typing import Callable
 
diff --git a/test/fx2trt/converters/acc_op/test_unsqueeze.py b/test/fx2trt/converters/acc_op/test_unsqueeze.py
index 082d0c48ee6..3dc6f0736a7 100644
--- a/test/fx2trt/converters/acc_op/test_unsqueeze.py
+++ b/test/fx2trt/converters/acc_op/test_unsqueeze.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx
diff --git a/test/fx2trt/converters/vanilla/test_add.py b/test/fx2trt/converters/vanilla/test_add.py
index e55a557a020..98e69f38698 100644
--- a/test/fx2trt/converters/vanilla/test_add.py
+++ b/test/fx2trt/converters/vanilla/test_add.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import operator
 
diff --git a/test/fx2trt/converters/vanilla/test_convolution.py b/test/fx2trt/converters/vanilla/test_convolution.py
index 56baf7e0752..81c7f5187a3 100644
--- a/test/fx2trt/converters/vanilla/test_convolution.py
+++ b/test/fx2trt/converters/vanilla/test_convolution.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch
 import torch.fx
diff --git a/test/fx2trt/core/test_import_fx2trt.py b/test/fx2trt/core/test_import_fx2trt.py
index 4daddf42abe..cb2f51cea21 100644
--- a/test/fx2trt/core/test_import_fx2trt.py
+++ b/test/fx2trt/core/test_import_fx2trt.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
 
+# Owner(s): ["oncall: aiacc"]
 
 # Test that this import should not trigger any error when run
 # in non-GPU hosts, or in any build mode.
diff --git a/test/fx2trt/core/test_input_tensor_spec.py b/test/fx2trt/core/test_input_tensor_spec.py
index e7daad8ac3b..8b07e6fad28 100644
--- a/test/fx2trt/core/test_input_tensor_spec.py
+++ b/test/fx2trt/core/test_input_tensor_spec.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 from typing import List, Optional
 
 import torch
diff --git a/test/fx2trt/core/test_trt_module.py b/test/fx2trt/core/test_trt_module.py
index f29423b69bb..2e53aeafb0b 100644
--- a/test/fx2trt/core/test_trt_module.py
+++ b/test/fx2trt/core/test_trt_module.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx
 import torch.fx.experimental.fx_acc.acc_tracer as acc_tracer
diff --git a/test/fx2trt/passes/test_fuse_permute_linear_trt.py b/test/fx2trt/passes/test_fuse_permute_linear_trt.py
index 03134280886..123b8af6646 100644
--- a/test/fx2trt/passes/test_fuse_permute_linear_trt.py
+++ b/test/fx2trt/passes/test_fuse_permute_linear_trt.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 from torch.testing._internal.common_fx2trt import AccTestCase
diff --git a/test/fx2trt/passes/test_fuse_permute_matmul_trt.py b/test/fx2trt/passes/test_fuse_permute_matmul_trt.py
index 196bcd218d9..6b3a80ba885 100644
--- a/test/fx2trt/passes/test_fuse_permute_matmul_trt.py
+++ b/test/fx2trt/passes/test_fuse_permute_matmul_trt.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 from torch.testing._internal.common_fx2trt import AccTestCase
diff --git a/test/fx2trt/passes/test_fuse_unsqueeze_cat_sum_trt.py b/test/fx2trt/passes/test_fuse_unsqueeze_cat_sum_trt.py
index f82e15881a5..43cb2f1df46 100644
--- a/test/fx2trt/passes/test_fuse_unsqueeze_cat_sum_trt.py
+++ b/test/fx2trt/passes/test_fuse_unsqueeze_cat_sum_trt.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 from torch.testing._internal.common_fx2trt import AccTestCase
diff --git a/test/fx2trt/passes/test_multi_fuse_trt.py b/test/fx2trt/passes/test_multi_fuse_trt.py
index 13f50e58ef9..985c19fddd9 100644
--- a/test/fx2trt/passes/test_multi_fuse_trt.py
+++ b/test/fx2trt/passes/test_multi_fuse_trt.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import torch
 import torch.fx.experimental.fx_acc.acc_ops as acc_ops
 from torch.testing._internal.common_fx2trt import AccTestCase
diff --git a/test/fx2trt/passes/test_remove_duplicate_output_args.py b/test/fx2trt/passes/test_remove_duplicate_output_args.py
index 84dbd643443..b1a3375b287 100644
--- a/test/fx2trt/passes/test_remove_duplicate_output_args.py
+++ b/test/fx2trt/passes/test_remove_duplicate_output_args.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import logging
 
 import torch.fx as fx
diff --git a/test/fx2trt/trt_lower/test_fx2trt_lower.py b/test/fx2trt/trt_lower/test_fx2trt_lower.py
index bcfaed80800..7bad0f43eaf 100644
--- a/test/fx2trt/trt_lower/test_fx2trt_lower.py
+++ b/test/fx2trt/trt_lower/test_fx2trt_lower.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: aiacc"]
+
 import logging
 # @manual=//caffe2:torch_fx2trt
 from torch.fx.experimental.fx2trt.lower import Lowerer
diff --git a/test/fx2trt/trt_lower/trt_operator_supported_test.py b/test/fx2trt/trt_lower/trt_operator_supported_test.py
index c562f75592b..c69de856499 100644
--- a/test/fx2trt/trt_lower/trt_operator_supported_test.py
+++ b/test/fx2trt/trt_lower/trt_operator_supported_test.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import torch.fx.experimental.fx_acc.acc_ops  # noqa: F401
 import torch
diff --git a/test/fx2trt/trt_lower/trt_splitter_test.py b/test/fx2trt/trt_lower/trt_splitter_test.py
index 5859106f46f..798709c32f8 100644
--- a/test/fx2trt/trt_lower/trt_splitter_test.py
+++ b/test/fx2trt/trt_lower/trt_splitter_test.py
@@ -1,4 +1,4 @@
-# Owner(s): ["oncall: fx"]
+# Owner(s): ["oncall: aiacc"]
 
 import operator
 
diff --git a/test/jit/test_alias_analysis.py b/test/jit/test_alias_analysis.py
index 8e5d951682a..00c015ccfab 100644
--- a/test/jit/test_alias_analysis.py
+++ b/test/jit/test_alias_analysis.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: jit"]
+
 from torch.testing._internal.jit_utils import JitTestCase
 from torch._C import parse_ir
 import torch
diff --git a/test/jit/test_device_analysis.py b/test/jit/test_device_analysis.py
index 047ed8b1cd0..efdc2fc92e6 100644
--- a/test/jit/test_device_analysis.py
+++ b/test/jit/test_device_analysis.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: jit"]
+
 from itertools import product
 import unittest
 
diff --git a/test/jit/test_dtype_analysis.py b/test/jit/test_dtype_analysis.py
index c014d797a89..4ccefd8152b 100644
--- a/test/jit/test_dtype_analysis.py
+++ b/test/jit/test_dtype_analysis.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: jit"]
+
 from itertools import product
 from typing import Tuple
 from unittest.case import expectedFailure
diff --git a/test/jit/test_if_hoisting.py b/test/jit/test_if_hoisting.py
index c8fd4a4bab3..939ceda3c56 100644
--- a/test/jit/test_if_hoisting.py
+++ b/test/jit/test_if_hoisting.py
@@ -1,3 +1,4 @@
+# Owner(s): ["oncall: jit"]
 
 import torch
 from torch.testing import FileCheck
diff --git a/test/mobile/test_upgraders.py b/test/mobile/test_upgraders.py
index e148ee14e0a..a5646453972 100644
--- a/test/mobile/test_upgraders.py
+++ b/test/mobile/test_upgraders.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: mobile"]
+
 import torch
 import torch.utils.bundled_inputs
 import io
diff --git a/test/quantization/dbr/test_quantize_dbr.py b/test/quantization/dbr/test_quantize_dbr.py
index 676ec3d39b0..21ddb146aa0 100644
--- a/test/quantization/dbr/test_quantize_dbr.py
+++ b/test/quantization/dbr/test_quantize_dbr.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: quantization"]
+
 import collections
 import copy
 import math
diff --git a/test/quantization/fx/test_subgraph_rewriter.py b/test/quantization/fx/test_subgraph_rewriter.py
index bd64febbe2a..eb4346a0f24 100644
--- a/test/quantization/fx/test_subgraph_rewriter.py
+++ b/test/quantization/fx/test_subgraph_rewriter.py
@@ -1,3 +1,4 @@
+# Owner(s): ["oncall: quantization"]
 # Copied from pytorch/test/fx/test_subgraph_rewriter.py
 
 import os
diff --git a/test/test_functionalization.py b/test/test_functionalization.py
index 6e967fad83b..28476ff2595 100644
--- a/test/test_functionalization.py
+++ b/test/test_functionalization.py
@@ -1,3 +1,5 @@
+# Owner(s): ["module: codegen"]
+
 import torch
 from torch.testing._internal.common_utils import TestCase, run_tests
 from torch.testing._internal.logging_tensor import LoggingTensor, capture_logs, log_input
diff --git a/test/test_masked.py b/test/test_masked.py
index a648fe0fa6d..24593d156fd 100644
--- a/test/test_masked.py
+++ b/test/test_masked.py
@@ -1,3 +1,5 @@
+# Owner(s): ["module: masked operators"]
+
 """Tests for masked operations.
 """
 
diff --git a/test/test_monitor.py b/test/test_monitor.py
index 7318280fcd6..51d0d7f405e 100644
--- a/test/test_monitor.py
+++ b/test/test_monitor.py
@@ -1,3 +1,5 @@
+# Owner(s): ["oncall: r2p"]
+
 from torch.testing._internal.common_utils import (
     TestCase, run_tests,
 )