diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD
index 12b42bc60a2..1ae1fa22c4d 100755
--- a/tensorflow/python/keras/BUILD
+++ b/tensorflow/python/keras/BUILD
@@ -538,9 +538,9 @@ tf_py_test(
         "//tensorflow/python:client_testlib",
     ],
     shard_count = 11,
-    # TODO(b/127881287): Re-enable.
     tags = [
-        "no_windows_gpu",
+        "no_windows",  # TODO(b/127888631)
+        "no_windows_gpu",  # TODO(b/127881287)
     ],
 )