diff --git a/tensorflow/python/eager/BUILD b/tensorflow/python/eager/BUILD
index 2c4bc0b2244..372660603bd 100644
--- a/tensorflow/python/eager/BUILD
+++ b/tensorflow/python/eager/BUILD
@@ -801,11 +801,11 @@ tf_py_test(
         "//tensorflow/python/tpu:tpu_strategy_util",
     ],
     tags = [
-        "manual",
+        "no_pip",
         "nogpu",
+        "noguitar",
         "nomac",
         "notap",
-        "oss_serial",
         "tpu",
     ],
 )