diff --git a/tensorflow/compiler/aot/tests/BUILD b/tensorflow/compiler/aot/tests/BUILD
index 51298a4b433..31e22c4fb46 100644
--- a/tensorflow/compiler/aot/tests/BUILD
+++ b/tensorflow/compiler/aot/tests/BUILD
@@ -115,8 +115,8 @@ genrule(
     # have control of the full GPU.
     cmd = "CUDA_VISIBLE_DEVICES='' " +
           "$(location :make_test_graphs) --out_dir $(@D)",
-    tools = [":make_test_graphs"],
     tags = ["manual"],
+    tools = [":make_test_graphs"],
 )
 
 tf_library(
diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index 2941ac7543f..8e40d51a221 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -399,8 +399,8 @@ genrule(
     cmd = (
         "$(location :make_aot_compile_models) --out_dir $(@D)"
     ),
-    tools = [":make_aot_compile_models"],
     tags = ["no_rocm"],
+    tools = [":make_aot_compile_models"],
 )
 
 filegroup(