diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 62bca659897..71a41c66246 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2498,7 +2498,6 @@ tf_py_test(
srcs = ["framework/importer_test.py"],
main = "framework/importer_test.py",
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":array_ops",
":client_testlib",
@@ -2820,7 +2819,6 @@ tf_py_test(
main = "framework/test_util_test.py",
python_version = "PY3",
tags = ["no_windows"],
- tfrt_enabled = True,
deps = [
":control_flow_ops",
":errors",
@@ -3504,7 +3502,6 @@ tf_py_test(
srcs = ["ops/collective_ops_test.py"],
python_version = "PY3",
tags = ["no_rocm"],
- tfrt_enabled = True,
deps = [
":client_testlib",
":collective_ops",
@@ -4455,7 +4452,6 @@ cuda_py_test(
size = "medium",
srcs = ["ops/stateful_random_ops_test.py"],
python_version = "PY3",
- tfrt_enabled = True,
xla_enable_strict_auto_jit = False,
xla_enabled = True,
deps = [
@@ -5314,7 +5310,6 @@ cuda_py_test(
srcs = ["ops/nn_fused_batchnorm_test.py"],
python_version = "PY3",
shard_count = 24,
- tfrt_enabled = True,
deps = [
":array_ops",
":client_testlib",
@@ -5332,7 +5327,6 @@ cuda_py_test(
srcs = ["ops/nn_test.py"],
python_version = "PY3",
tags = ["no_windows"],
- tfrt_enabled = True,
deps = [
":array_ops",
":client_testlib",
@@ -5366,7 +5360,6 @@ cuda_py_test(
size = "medium",
srcs = ["ops/nn_xent_test.py"],
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":client_testlib",
":framework_for_generated_wrappers",
@@ -6338,7 +6331,6 @@ tf_py_test(
"no_pip_gpu", # testInteractivePlacePrunedGraph fails on invalid assumption about GPU ops.
"no_windows",
],
- tfrt_enabled = True,
deps = [
":array_ops",
":client",
@@ -6515,7 +6507,6 @@ tf_py_test(
srcs = ["framework/convert_to_constants_test.py"],
python_version = "PY3",
tags = ["no_rocm"],
- tfrt_enabled = True,
deps = [
":client_testlib",
":control_flow_v2_toggles",
@@ -6704,7 +6695,6 @@ tf_py_test(
srcs = ["ops/dequantize_op_test.py"],
python_version = "PY3",
tags = ["no_windows"],
- tfrt_enabled = True,
deps = [
":array_ops",
":client_testlib",
@@ -6719,7 +6709,6 @@ tf_py_test(
srcs = ["ops/quantized_ops_test.py"],
python_version = "PY3",
tags = ["no_windows"],
- tfrt_enabled = True,
deps = [
":array_ops",
":client_testlib",
@@ -6734,7 +6723,6 @@ tf_py_test(
srcs = ["ops/quantized_conv_ops_test.py"],
python_version = "PY3",
tags = ["no_windows"],
- tfrt_enabled = True,
deps = [
":client_testlib",
":framework_for_generated_wrappers",
diff --git a/tensorflow/python/autograph/impl/BUILD b/tensorflow/python/autograph/impl/BUILD
index 30ee67d41bc..4c5475bbb74 100644
--- a/tensorflow/python/autograph/impl/BUILD
+++ b/tensorflow/python/autograph/impl/BUILD
@@ -42,7 +42,6 @@ tf_py_test(
srcs = ["api_test.py"],
python_version = "PY3",
srcs_version = "PY3",
- tfrt_enabled = True,
deps = [
":impl",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD
index b9a74e595a3..c219d5d6612 100755
--- a/tensorflow/python/keras/BUILD
+++ b/tensorflow/python/keras/BUILD
@@ -459,7 +459,6 @@ tf_py_test(
size = "small",
srcs = ["metrics_functional_test.py"],
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":combinations",
":keras",
diff --git a/tensorflow/python/keras/applications/BUILD b/tensorflow/python/keras/applications/BUILD
index 274022b6f24..fb33eb17050 100644
--- a/tensorflow/python/keras/applications/BUILD
+++ b/tensorflow/python/keras/applications/BUILD
@@ -84,7 +84,6 @@ tf_py_test(
"no_pip",
"notsan", # b/168814536
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -102,7 +101,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -120,7 +118,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -138,7 +135,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -156,7 +152,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -174,7 +169,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -192,7 +186,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -210,7 +203,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -228,7 +220,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -246,7 +237,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -264,7 +254,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -284,7 +273,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -304,7 +292,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -322,7 +309,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -340,7 +326,6 @@ tf_py_test(
"no_oss",
"no_pip",
],
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
@@ -354,7 +339,6 @@ tf_py_test(
size = "medium",
srcs = ["imagenet_utils_test.py"],
shard_count = 2,
- tfrt_enabled = True,
deps = [
":applications",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/keras/engine/BUILD b/tensorflow/python/keras/engine/BUILD
index df470c0cd44..af819ff6aa4 100644
--- a/tensorflow/python/keras/engine/BUILD
+++ b/tensorflow/python/keras/engine/BUILD
@@ -551,7 +551,6 @@ tf_py_test(
"no_oss", # TODO(b/135021748) reenable
"notsan",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python/keras",
diff --git a/tensorflow/python/keras/layers/BUILD b/tensorflow/python/keras/layers/BUILD
index 4f5be05d619..517d8c4e58a 100644
--- a/tensorflow/python/keras/layers/BUILD
+++ b/tensorflow/python/keras/layers/BUILD
@@ -873,7 +873,6 @@ tf_py_test(
size = "small",
srcs = ["kernelized_test.py"],
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":layers",
"//tensorflow/python:array_ops",
diff --git a/tensorflow/python/keras/legacy_tf_layers/BUILD b/tensorflow/python/keras/legacy_tf_layers/BUILD
index 510314c26c9..45ccd958db0 100644
--- a/tensorflow/python/keras/legacy_tf_layers/BUILD
+++ b/tensorflow/python/keras/legacy_tf_layers/BUILD
@@ -147,7 +147,6 @@ tf_py_test(
srcs = ["convolutional_test.py"],
main = "convolutional_test.py",
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":convolutional",
"//tensorflow/python:array_ops",
diff --git a/tensorflow/python/keras/saving/BUILD b/tensorflow/python/keras/saving/BUILD
index 18aa8990dc0..7e92defc1d8 100644
--- a/tensorflow/python/keras/saving/BUILD
+++ b/tensorflow/python/keras/saving/BUILD
@@ -137,7 +137,6 @@ tf_py_test(
"no_oss", # TODO(b/119349471): Re-enable
"no_windows",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python/keras",
diff --git a/tensorflow/python/keras/tests/BUILD b/tensorflow/python/keras/tests/BUILD
index 33e1185d2a4..4c9db00dd41 100644
--- a/tensorflow/python/keras/tests/BUILD
+++ b/tensorflow/python/keras/tests/BUILD
@@ -92,7 +92,6 @@ tf_py_test(
srcs = ["convert_to_constants_test.py"],
python_version = "PY3",
shard_count = 4,
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -177,7 +176,6 @@ tf_py_test(
srcs = ["model_architectures_test.py"],
python_version = "PY3",
shard_count = 16,
- tfrt_enabled = True,
deps = [
":model_architectures",
"//tensorflow/python/keras",
diff --git a/tensorflow/python/keras/utils/BUILD b/tensorflow/python/keras/utils/BUILD
index 57fb70ebb3d..1e87d8545cb 100644
--- a/tensorflow/python/keras/utils/BUILD
+++ b/tensorflow/python/keras/utils/BUILD
@@ -248,7 +248,6 @@ tf_py_test(
size = "small",
srcs = ["generic_utils_test.py"],
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":generic_utils",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/keras/wrappers/BUILD b/tensorflow/python/keras/wrappers/BUILD
index fa3d2df4532..44a96ed5c6d 100644
--- a/tensorflow/python/keras/wrappers/BUILD
+++ b/tensorflow/python/keras/wrappers/BUILD
@@ -36,7 +36,6 @@ tf_py_test(
srcs = ["scikit_learn_test.py"],
python_version = "PY3",
tags = ["notsan"],
- tfrt_enabled = True,
deps = [
":wrappers",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index d874f4f685c..af1521d89c6 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -779,7 +779,6 @@ tf_py_test(
srcs = ["matrix_exponential_op_test.py"],
shard_count = 16,
tags = ["no_windows_gpu"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
@@ -900,7 +899,6 @@ tf_py_test(
name = "parse_single_example_op_test",
size = "small",
srcs = ["parse_single_example_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/core:protos_all_py",
"//tensorflow/python:array_ops",
@@ -1192,7 +1190,6 @@ tf_py_test(
name = "string_split_op_test",
size = "small",
srcs = ["string_split_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -1398,7 +1395,6 @@ cuda_py_test(
tags = [
"no_oss", # TODO(b/142818120): Re-enable.
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
@@ -1739,7 +1735,6 @@ cuda_py_test(
size = "medium",
srcs = ["batch_matmul_op_test.py"],
shard_count = 20,
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -1815,7 +1810,6 @@ cuda_py_test(
name = "bitcast_op_test",
size = "small",
srcs = ["bitcast_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -1846,7 +1840,6 @@ cuda_py_test(
name = "constant_op_test",
size = "small",
srcs = ["constant_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -2102,7 +2095,6 @@ cuda_py_test(
name = "dynamic_stitch_op_test",
size = "small",
srcs = ["dynamic_stitch_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:data_flow_grad",
@@ -2311,7 +2303,6 @@ cuda_py_test(
size = "medium",
srcs = ["matmul_op_test.py"],
shard_count = 20,
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -2487,7 +2478,6 @@ cuda_py_test(
tags = [
"no_windows_gpu",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -2614,7 +2604,6 @@ cuda_py_test(
name = "shape_ops_test",
size = "medium",
srcs = ["shape_ops_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/core:protos_all_py",
"//tensorflow/python:array_ops",
@@ -2632,7 +2621,6 @@ cuda_py_test(
name = "softmax_op_test",
size = "medium",
srcs = ["softmax_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -2647,7 +2635,6 @@ cuda_py_test(
name = "softplus_op_test",
size = "small",
srcs = ["softplus_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
@@ -2695,7 +2682,6 @@ cuda_py_test(
"no_windows",
"no_windows_gpu",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -3153,7 +3139,6 @@ cuda_py_test(
size = "medium",
srcs = ["pooling_ops_test.py"],
shard_count = 4,
- tfrt_enabled = True,
xla_enable_strict_auto_jit = False, # Flaky in XLA b/149568654
deps = [
"//tensorflow/python:array_ops",
@@ -3204,7 +3189,6 @@ cuda_py_test(
srcs = ["rnn_cell_test.py"],
shard_count = 15,
tags = ["no_windows"], # b/139739217
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -3438,7 +3422,6 @@ cuda_py_test(
srcs = ["cwise_ops_test.py"],
shard_count = 50,
tags = ["no_windows"], # b/163222163
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -3459,7 +3442,6 @@ cuda_py_test(
size = "medium",
srcs = ["cwise_ops_binary_test.py"],
shard_count = 50,
- tfrt_enabled = True,
# b/140155647: Error just outside of tolerance
xla_enable_strict_auto_jit = False,
deps = [
@@ -3565,7 +3547,6 @@ tf_py_test(
tags = [
"no_windows",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -3586,7 +3567,6 @@ cuda_py_test(
tags = [
"no_windows",
],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -3880,7 +3860,6 @@ cuda_py_test(
size = "medium",
srcs = ["cond_v2_test.py"],
grpc_enabled = True,
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/kernel_tests/array_ops/BUILD b/tensorflow/python/kernel_tests/array_ops/BUILD
index 76c8d5219c5..df17e5a3a39 100644
--- a/tensorflow/python/kernel_tests/array_ops/BUILD
+++ b/tensorflow/python/kernel_tests/array_ops/BUILD
@@ -54,7 +54,6 @@ cuda_py_test(
name = "gather_op_test",
size = "medium",
srcs = ["gather_op_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
index ff530da88a6..4b0915b37e7 100644
--- a/tensorflow/python/kernel_tests/distributions/BUILD
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -95,7 +95,6 @@ cuda_py_test(
name = "categorical_test",
size = "small",
srcs = ["categorical_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
@@ -193,7 +192,6 @@ cuda_py_test(
cuda_py_test(
name = "multinomial_test",
srcs = ["multinomial_test.py"],
- tfrt_enabled = True,
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/kernel_tests/proto/BUILD b/tensorflow/python/kernel_tests/proto/BUILD
index cc6147a8fd2..e5c46c76e2e 100644
--- a/tensorflow/python/kernel_tests/proto/BUILD
+++ b/tensorflow/python/kernel_tests/proto/BUILD
@@ -28,7 +28,6 @@ tf_py_test(
"no_pip", # TODO(b/78026780)
"no_windows", # TODO(b/78028010)
],
- tfrt_enabled = True,
deps = [
":decode_proto_op_test_base",
":py_test_deps",
@@ -49,7 +48,6 @@ tf_py_test(
"no_pip", # TODO(b/78026780)
"no_windows", # TODO(b/78028010)
],
- tfrt_enabled = True,
deps = [
":encode_proto_op_test_base",
":py_test_deps",
diff --git a/tensorflow/python/kernel_tests/random/BUILD b/tensorflow/python/kernel_tests/random/BUILD
index 6add4128371..35129a59b84 100644
--- a/tensorflow/python/kernel_tests/random/BUILD
+++ b/tensorflow/python/kernel_tests/random/BUILD
@@ -143,7 +143,6 @@ cuda_py_test(
srcs = ["random_gamma_test.py"],
shard_count = 4,
tags = ["nozapfhahn"],
- tfrt_enabled = True,
deps = [
":util",
"//tensorflow/python:array_ops",
diff --git a/tensorflow/python/training/BUILD b/tensorflow/python/training/BUILD
index 0cc1c45af4f..cf2d89b0d1f 100644
--- a/tensorflow/python/training/BUILD
+++ b/tensorflow/python/training/BUILD
@@ -1236,7 +1236,6 @@ cuda_py_test(
grpc_enabled = True,
main = "session_manager_test.py",
python_version = "PY3",
- tfrt_enabled = True,
deps = [
":checkpoint_management",
":saver",