diff --git a/tensorflow/examples/speech_commands/BUILD b/tensorflow/examples/speech_commands/BUILD
index dbe5b2841ee..ea8a7d89ed9 100644
--- a/tensorflow/examples/speech_commands/BUILD
+++ b/tensorflow/examples/speech_commands/BUILD
@@ -69,13 +69,13 @@ tf_py_test(
     name = "models_test",
     size = "small",
     srcs = ["models_test.py"],
-    additional_deps = [
-        ":models",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
     ],
+    deps = [
+        ":models",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 py_library(
@@ -96,15 +96,15 @@ tf_py_test(
     name = "input_data_test",
     size = "small",
     srcs = ["input_data_test.py"],
-    additional_deps = [
-        ":input_data",
-        ":models",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":input_data",
+        ":models",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 py_binary(
@@ -134,14 +134,14 @@ tf_py_test(
     name = "train_test",
     size = "small",
     srcs = ["train_test.py"],
-    additional_deps = [
-        ":train_main_lib",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":train_main_lib",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 py_binary(
@@ -181,14 +181,14 @@ tf_py_test(
     name = "freeze_test",
     size = "small",
     srcs = ["freeze_test.py"],
-    additional_deps = [
-        ":freeze_main_lib",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":freeze_main_lib",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 py_binary(
@@ -225,14 +225,14 @@ tf_py_test(
     name = "wav_to_features_test",
     size = "small",
     srcs = ["wav_to_features_test.py"],
-    additional_deps = [
-        ":wav_to_features_main_lib",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":wav_to_features_main_lib",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 py_binary(
@@ -269,14 +269,14 @@ tf_py_test(
     name = "generate_streaming_test_wav_test",
     size = "small",
     srcs = ["generate_streaming_test_wav_test.py"],
-    additional_deps = [
-        ":generate_streaming_test_wav_main_lib",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":generate_streaming_test_wav_main_lib",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 tf_cc_binary(
@@ -324,14 +324,14 @@ tf_py_test(
     name = "label_wav_test",
     size = "medium",
     srcs = ["label_wav_test.py"],
-    additional_deps = [
-        ":label_wav_main_lib",
-        "//tensorflow/python:client_testlib",
-    ],
     tags = [
         "no_pip",  # b/131330719
         "v1only",  # uses contrib
     ],
+    deps = [
+        ":label_wav_main_lib",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 cc_library(
diff --git a/tensorflow/examples/tutorials/mnist/BUILD b/tensorflow/examples/tutorials/mnist/BUILD
index 96ca6d44395..be8cdc3a1c2 100644
--- a/tensorflow/examples/tutorials/mnist/BUILD
+++ b/tensorflow/examples/tutorials/mnist/BUILD
@@ -98,17 +98,17 @@ tf_py_test(
     srcs = [
         "fully_connected_feed.py",
     ],
-    additional_deps = [
-        ":input_data",
-        ":mnist",
-        "//tensorflow:tensorflow_py",
-    ],
     args = [
         "--fake_data",
         "--max_steps=10",
     ],
     main = "fully_connected_feed.py",
     tags = ["no_pip"],
+    deps = [
+        ":input_data",
+        ":mnist",
+        "//tensorflow:tensorflow_py",
+    ],
 )
 
 tf_py_test(
@@ -117,10 +117,6 @@ tf_py_test(
     srcs = [
         "mnist_with_summaries.py",
     ],
-    additional_deps = [
-        ":input_data",
-        "//tensorflow:tensorflow_py",
-    ],
     args = [
         "--fake_data",
         "--max_steps=10",
@@ -132,4 +128,8 @@ tf_py_test(
         "noasan",  # http://b/146080738
         "notsan",  # http://b/29184009
     ],
+    deps = [
+        ":input_data",
+        "//tensorflow:tensorflow_py",
+    ],
 )
diff --git a/tensorflow/lite/experimental/microfrontend/BUILD b/tensorflow/lite/experimental/microfrontend/BUILD
index eb7d62081c4..aaaf864bb60 100644
--- a/tensorflow/lite/experimental/microfrontend/BUILD
+++ b/tensorflow/lite/experimental/microfrontend/BUILD
@@ -92,9 +92,9 @@ tf_py_test(
     name = "audio_microfrontend_op_test",
     size = "small",
     srcs = ["python/kernel_tests/audio_microfrontend_op_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":audio_microfrontend_py",
         "//tensorflow:tensorflow_py",
     ],
-    tags = ["no_pip"],
 )
diff --git a/tensorflow/lite/toco/python/BUILD b/tensorflow/lite/toco/python/BUILD
index 14ea753e630..b8a00b90a06 100644
--- a/tensorflow/lite/toco/python/BUILD
+++ b/tensorflow/lite/toco/python/BUILD
@@ -89,14 +89,14 @@ py_binary(
 tf_py_test(
     name = "toco_from_protos_test",
     srcs = ["toco_from_protos_test.py"],
-    additional_deps = [
-        "//tensorflow:tensorflow_py",
-        "//tensorflow/lite/toco:model_flags_proto_py",
-        "//tensorflow/lite/toco:toco_flags_proto_py",
-    ],
     python_version = "PY3",
     tags = [
         "no_oss",
         "no_pip",
     ],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/lite/toco:model_flags_proto_py",
+        "//tensorflow/lite/toco:toco_flags_proto_py",
+    ],
 )
diff --git a/tensorflow/python/compat/BUILD b/tensorflow/python/compat/BUILD
index 78f14631055..3e211777c05 100644
--- a/tensorflow/python/compat/BUILD
+++ b/tensorflow/python/compat/BUILD
@@ -32,20 +32,20 @@ tf_py_test(
     name = "compat_test",
     size = "small",
     srcs = ["compat_test.py"],
-    additional_deps = [
+    tags = ["nofwdcompat"],
+    deps = [
         ":compat",
         "//tensorflow/python:client_testlib",
     ],
-    tags = ["nofwdcompat"],
 )
 
 tf_py_test(
     name = "disable_v2_behavior_test",
     size = "small",
     srcs = ["disable_v2_behavior_test.py"],
-    additional_deps = [
+    deps = [
         ":v2_compat",
-        "//tensorflow/python:framework",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
     ],
 )
diff --git a/tensorflow/python/data/benchmarks/BUILD b/tensorflow/python/data/benchmarks/BUILD
index bc8240227e8..a9422e83edc 100644
--- a/tensorflow/python/data/benchmarks/BUILD
+++ b/tensorflow/python/data/benchmarks/BUILD
@@ -10,12 +10,12 @@ exports_files(["LICENSE"])
 tf_py_test(
     name = "meta_benchmark",
     srcs = ["meta_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:session",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -34,18 +34,18 @@ py_library(
 tf_py_test(
     name = "batch_benchmark",
     srcs = ["batch_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "filter_benchmark",
     srcs = ["filter_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
@@ -54,31 +54,31 @@ tf_py_test(
 tf_py_test(
     name = "from_tensor_slices_benchmark",
     srcs = ["from_tensor_slices_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
-        "//third_party/py/numpy",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "list_files_benchmark",
     srcs = ["list_files_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:session",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "map_benchmark",
     srcs = ["map_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
@@ -87,7 +87,7 @@ tf_py_test(
 tf_py_test(
     name = "range_benchmark",
     srcs = ["range_benchmark.py"],
-    additional_deps = [
+    deps = [
         ":benchmark_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
diff --git a/tensorflow/python/data/experimental/benchmarks/BUILD b/tensorflow/python/data/experimental/benchmarks/BUILD
index 0759a345b29..9a8c7e2164a 100644
--- a/tensorflow/python/data/experimental/benchmarks/BUILD
+++ b/tensorflow/python/data/experimental/benchmarks/BUILD
@@ -15,33 +15,32 @@ exports_files(
 tf_py_test(
     name = "autotune_benchmark",
     srcs = ["autotune_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:session",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "choose_fastest_benchmark",
     srcs = ["choose_fastest_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:session",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "choose_fastest_branch_benchmark",
     srcs = ["choose_fastest_branch_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
@@ -49,14 +48,15 @@ tf_py_test(
         "//tensorflow/python/data/benchmarks:benchmark_base",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "csv_dataset_benchmark",
     srcs = ["csv_dataset_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
@@ -64,15 +64,14 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python/data/experimental/ops:readers",
         "//tensorflow/python/data/ops:readers",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "map_and_batch_benchmark",
     srcs = ["map_and_batch_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -83,13 +82,14 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "map_defun_benchmark",
     srcs = ["map_defun_benchmark.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -104,8 +104,7 @@ tf_py_test(
 tf_py_test(
     name = "map_vectorization_benchmark",
     srcs = ["map_vectorization_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -116,6 +115,7 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -123,8 +123,7 @@ tf_py_test(
     name = "matching_files_benchmark",
     size = "small",
     srcs = ["matching_files_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -132,54 +131,54 @@ tf_py_test(
         "//tensorflow/python:util",
         "//tensorflow/python/data/experimental/ops:matching_files",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "optimize_benchmark",
     srcs = ["optimize_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:session",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "parallel_interleave_benchmark",
     srcs = ["parallel_interleave_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:session",
         "//tensorflow/python/data/experimental/ops:interleave_ops",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "rejection_resample_benchmark",
     srcs = ["rejection_resample_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "@six_archive//:six",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/data/experimental/ops:resampling",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "snapshot_dataset_benchmark",
     srcs = ["snapshot_dataset_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -190,14 +189,14 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:snapshot",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "unbatch_benchmark",
     srcs = ["unbatch_benchmark.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -205,5 +204,6 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
diff --git a/tensorflow/python/data/experimental/kernel_tests/BUILD b/tensorflow/python/data/experimental/kernel_tests/BUILD
index d21241d900c..ad85fbf493a 100644
--- a/tensorflow/python/data/experimental/kernel_tests/BUILD
+++ b/tensorflow/python/data/experimental/kernel_tests/BUILD
@@ -12,27 +12,29 @@ tf_py_test(
     name = "assert_next_test",
     size = "small",
     srcs = ["assert_next_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "auto_shard_dataset_test",
     size = "medium",
     srcs = ["auto_shard_dataset_test.py"],
-    additional_deps = [
+    tags = [
+        "no_pip",
+    ],
+    deps = [
         ":reader_dataset_ops_test_base",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/data/experimental/ops:distribute",
         "//tensorflow/python/data/experimental/ops:readers",
@@ -40,9 +42,7 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
-    ],
-    tags = [
-        "no_pip",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -50,9 +50,7 @@ tf_py_test(
     name = "bucket_by_sequence_length_test",
     size = "medium",
     srcs = ["bucket_by_sequence_length_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -62,17 +60,19 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:grouping",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
 tf_py_test(
     name = "cardinality_test",
     srcs = ["cardinality_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/python/data/experimental/ops:cardinality",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -100,7 +100,7 @@ tf_py_test(
     name = "counter_test",
     size = "small",
     srcs = ["counter_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python/data/experimental/ops:counter",
@@ -112,7 +112,8 @@ tf_py_test(
     name = "csv_dataset_test",
     size = "medium",
     srcs = ["csv_dataset_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -125,14 +126,12 @@ tf_py_test(
         "//tensorflow/python/data/ops:readers",
         "//tensorflow/python/eager:context",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "dense_to_sparse_batch_test",
     srcs = ["dense_to_sparse_batch_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -140,20 +139,21 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "dense_to_ragged_batch_test",
     srcs = ["dense_to_ragged_batch_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -161,14 +161,14 @@ tf_py_test(
     name = "directed_interleave_dataset_test",
     size = "medium",
     srcs = ["directed_interleave_dataset_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:random_seed",
         "//tensorflow/python/data/experimental/ops:interleave_ops",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -176,8 +176,7 @@ tf_py_test(
     name = "get_single_element_test",
     size = "small",
     srcs = ["get_single_element_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -188,6 +187,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:grouping",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -195,8 +195,7 @@ tf_py_test(
     name = "group_by_reducer_test",
     size = "medium",
     srcs = ["group_by_reducer_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -208,6 +207,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:grouping",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -215,8 +215,7 @@ tf_py_test(
     name = "group_by_window_test",
     size = "medium",
     srcs = ["group_by_window_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -229,14 +228,14 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:grouping",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "ignore_errors_test",
     srcs = ["ignore_errors_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -245,6 +244,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:error_ops",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -252,9 +252,9 @@ tf_py_test(
     name = "make_batched_features_dataset_test",
     size = "medium",
     srcs = ["make_batched_features_dataset_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":reader_dataset_ops_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -264,16 +264,16 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:readers",
         "//tensorflow/python/data/ops:readers",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "make_csv_dataset_test",
     size = "medium",
     srcs = ["make_csv_dataset_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -282,15 +282,16 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:readers",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "make_tf_record_dataset_test",
     size = "medium",
     srcs = ["make_tf_record_dataset_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":reader_dataset_ops_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -299,16 +300,13 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:readers",
         "//tensorflow/python/data/util:nest",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "map_and_batch_test",
     size = "medium",
     srcs = ["map_and_batch_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:cond_v2",
@@ -321,6 +319,8 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -328,7 +328,8 @@ tf_py_test(
     name = "map_defun_op_test",
     size = "small",
     srcs = ["map_defun_op_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
         "//tensorflow/python:client_testlib",
@@ -345,15 +346,14 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:map_defun",
         "//tensorflow/python/data/kernel_tests:test_base",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "matching_files_test",
     size = "small",
     srcs = ["matching_files_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -362,26 +362,26 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:matching_files",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "model_dataset_test",
     size = "small",
     srcs = ["model_dataset_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -389,27 +389,30 @@ tf_py_test(
     name = "non_serializable_test",
     size = "small",
     srcs = ["non_serializable_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "optimize_dataset_test",
     size = "medium",
     srcs = ["optimize_dataset_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -424,11 +427,8 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/eager:context",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -436,9 +436,8 @@ tf_py_test(
     name = "override_threadpool_test",
     size = "small",
     srcs = ["override_threadpool_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -447,16 +446,17 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:unique",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "parallel_interleave_test",
     size = "medium",
     srcs = ["parallel_interleave_test.py"],
-    additional_deps = [
-        "@six_archive//:six",
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -468,16 +468,15 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:interleave_ops",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
+        "@six_archive//:six",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "parse_example_dataset_test",
     size = "small",
     srcs = ["parse_example_dataset_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -490,6 +489,7 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -514,8 +514,7 @@ tf_py_test(
     name = "prefetch_with_slack_test",
     size = "small",
     srcs = ["prefetch_with_slack_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -524,6 +523,7 @@ tf_py_test(
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/ops:iterator_ops",
         "//tensorflow/python/data/ops:multi_device_iterator_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -553,8 +553,7 @@ tf_py_test(
     name = "rebatch_dataset_test",
     size = "small",
     srcs = ["rebatch_dataset_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:parsing_ops",
@@ -563,6 +562,7 @@ tf_py_test(
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
         "//tensorflow/python/ops/ragged:ragged_tensor",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -570,10 +570,12 @@ tf_py_test(
     name = "rejection_resample_test",
     size = "medium",
     srcs = ["rejection_resample_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
+    shard_count = 5,
+    tags = [
+        "noasan",
+        "optonly",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -584,40 +586,38 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:resampling",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    shard_count = 5,
-    tags = [
-        "noasan",
-        "optonly",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+        "@six_archive//:six",
     ],
 )
 
 tf_py_test(
     name = "replicate_test",
     srcs = ["replicate_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    tags = ["no_oss"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_combinations",
         "//tensorflow/python/data/experimental/ops:distribute",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    grpc_enabled = True,
-    tags = ["no_oss"],
 )
 
 tf_py_test(
     name = "replicate_cluster_test",
     srcs = ["replicate_cluster_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    tags = ["no_oss"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_combinations",
         "//tensorflow/python/data/experimental/ops:distribute",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    grpc_enabled = True,
-    tags = ["no_oss"],
 )
 
 cuda_py_test(
@@ -649,25 +649,25 @@ tf_py_test(
     name = "shuffle_and_repeat_test",
     size = "medium",
     srcs = ["shuffle_and_repeat_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = [
+        "no_pip",
+        "optonly",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python/data/experimental/ops:shuffle_ops",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_pip",
-        "optonly",
+        "//third_party/py/numpy",
     ],
 )
 
 tf_py_test(
     name = "sleep_test",
     srcs = ["sleep_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:util",
         "//tensorflow/python/data/experimental/ops:testing",
@@ -698,41 +698,42 @@ tf_py_test(
     name = "sql_dataset_test",
     size = "medium",
     srcs = ["sql_dataset_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":sql_dataset_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "snapshot_test",
     size = "medium",
     srcs = ["snapshot_test.py"],
-    additional_deps = [
+    shard_count = 10,
+    deps = [
         ":reader_dataset_ops_test_base",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:string_ops",
         "//tensorflow/python/data/experimental/ops:snapshot",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/ops:readers",
+        "@absl_py//absl/testing:parameterized",
     ],
-    shard_count = 10,
 )
 
 tf_py_test(
     name = "stats_dataset_ops_test",
     size = "large",
     srcs = ["stats_dataset_ops_test.py"],
-    additional_deps = [
+    tags = [
+        "no_pip",
+    ],
+    deps = [
         ":reader_dataset_ops_test_base",
         ":stats_dataset_test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -743,9 +744,8 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:stats_ops",
         "//tensorflow/python/data/experimental/ops:stats_options",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_pip",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -764,9 +764,7 @@ tf_py_test(
     name = "take_while_test",
     size = "small",
     srcs = ["take_while_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -778,6 +776,8 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/eager:context",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -785,7 +785,7 @@ tf_py_test(
     name = "tf_record_writer_test",
     size = "small",
     srcs = ["tf_record_writer_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -802,7 +802,8 @@ tf_py_test(
     name = "unique_test",
     size = "small",
     srcs = ["unique_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -811,13 +812,12 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = ["no_pip"],
 )
 
 tf_py_test(
     name = "variant_test",
     srcs = ["variant_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:util",
         "//tensorflow/python/data/kernel_tests:test_base",
diff --git a/tensorflow/python/data/experimental/kernel_tests/optimization/BUILD b/tensorflow/python/data/experimental/kernel_tests/optimization/BUILD
index 4cd2a3d1fcd..06d5305c885 100644
--- a/tensorflow/python/data/experimental/kernel_tests/optimization/BUILD
+++ b/tensorflow/python/data/experimental/kernel_tests/optimization/BUILD
@@ -11,18 +11,18 @@ tf_py_test(
     name = "choose_fastest_dataset_test",
     size = "small",
     srcs = ["choose_fastest_dataset_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:optimization",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -30,8 +30,12 @@ tf_py_test(
     name = "filter_fusion_test",
     size = "medium",
     srcs = ["filter_fusion_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -41,11 +45,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -53,8 +53,14 @@ tf_py_test(
     name = "filter_with_random_uniform_fusion_test",
     size = "medium",
     srcs = ["filter_with_random_uniform_fusion_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "manual",
+        "no_oss",
+        "no_pip",
+        "no_windows",
+        "notap",  # TODO(b/131229793)
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -64,13 +70,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "manual",
-        "no_oss",
-        "no_pip",
-        "no_windows",
-        "notap",  # TODO(b/131229793)
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -78,8 +78,12 @@ tf_py_test(
     name = "hoist_random_uniform_test",
     size = "small",
     srcs = ["hoist_random_uniform_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:control_flow_ops",
@@ -92,11 +96,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -104,25 +104,30 @@ tf_py_test(
     name = "inject_prefetch_test",
     size = "small",
     srcs = ["inject_prefetch_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "latency_all_edges_test",
     size = "small",
     srcs = ["latency_all_edges_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/kernel_tests:stats_dataset_test_base",
@@ -131,17 +136,17 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "map_and_batch_fusion_test",
     srcs = ["map_and_batch_fusion_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:optimization_options",
@@ -149,18 +154,17 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "map_and_filter_fusion_test",
     srcs = ["map_and_filter_fusion_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -170,30 +174,26 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
 tf_py_test(
     name = "map_fusion_test",
     srcs = ["map_fusion_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:optimization_options",
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -201,8 +201,12 @@ tf_py_test(
     name = "map_parallelization_test",
     size = "small",
     srcs = ["map_parallelization_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:control_flow_ops",
@@ -215,11 +219,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -227,9 +227,13 @@ tf_py_test(
     name = "map_vectorization_test",
     size = "small",
     srcs = ["map_vectorization_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    shard_count = 8,
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:bitwise_ops",
@@ -251,12 +255,8 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:testing",
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    shard_count = 8,
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -264,7 +264,12 @@ tf_py_test(
     name = "noop_elimination_test",
     size = "small",
     srcs = ["noop_elimination_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -274,17 +279,17 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "shuffle_and_repeat_fusion_test",
     srcs = ["shuffle_and_repeat_fusion_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/experimental/ops:optimization_options",
@@ -292,9 +297,4 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
diff --git a/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD b/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD
index 95cbb140eed..2a21322fa53 100644
--- a/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD
+++ b/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD
@@ -35,9 +35,13 @@ tf_py_test(
     name = "auto_shard_dataset_serialization_test",
     size = "medium",
     srcs = ["auto_shard_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:sparse_tensor",
@@ -45,11 +49,7 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:interleave_ops",
         "//tensorflow/python/data/experimental/ops:readers",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -57,19 +57,19 @@ tf_py_test(
     name = "batch_dataset_serialization_test",
     size = "medium",
     srcs = ["batch_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -77,25 +77,30 @@ tf_py_test(
     name = "cache_dataset_serialization_test",
     size = "small",
     srcs = ["cache_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "checkpoint_input_pipeline_hook_test",
     size = "small",
     srcs = ["checkpoint_input_pipeline_hook_test.py"],
-    additional_deps = [
+    tags = [
+        "no_pip",
+        "no_windows",
+        "notsan",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -107,18 +112,18 @@ tf_py_test(
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/estimator:estimator_py",
     ],
-    tags = [
-        "no_pip",
-        "no_windows",
-        "notsan",
-    ],
 )
 
 tf_py_test(
     name = "choose_fastest_branch_dataset_serialization_test",
     size = "medium",
     srcs = ["choose_fastest_branch_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -127,140 +132,140 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:optimization",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "choose_fastest_dataset_serialization_test",
     size = "small",
     srcs = ["choose_fastest_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:optimization",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:optimization",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "concatenate_dataset_serialization_test",
     size = "small",
     srcs = ["concatenate_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "snapshot_dataset_serialization_test",
     size = "small",
     srcs = ["snapshot_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "csv_dataset_serialization_test",
     size = "small",
     srcs = ["csv_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_ops",
-        "//tensorflow/python/data/experimental/ops:readers",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python/data/experimental/ops:readers",
+    ],
 )
 
 tf_py_test(
     name = "dataset_constructor_serialization_test",
     size = "medium",
     srcs = ["dataset_constructor_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:sparse_tensor",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "filter_dataset_serialization_test",
     size = "medium",
     srcs = ["filter_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:sparse_tensor",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "fixed_length_record_dataset_serialization_test",
     size = "medium",
     srcs = ["fixed_length_record_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
-        "//tensorflow/python/data/ops:readers",
-    ],
     shard_count = 4,
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
+        "//tensorflow/python/data/ops:readers",
+    ],
 )
 
 tf_py_test(
     name = "flat_map_dataset_serialization_test",
     size = "medium",
     srcs = ["flat_map_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -274,113 +279,112 @@ tf_py_test(
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "group_by_reducer_serialization_test",
     size = "medium",
     srcs = ["group_by_reducer_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:grouping",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:grouping",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "group_by_window_serialization_test",
     size = "medium",
     srcs = ["group_by_window_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:grouping",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:grouping",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "ignore_errors_serialization_test",
     size = "small",
     srcs = ["ignore_errors_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:error_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:error_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "interleave_dataset_serialization_test",
     size = "medium",
     srcs = ["interleave_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:sparse_ops",
-        "//tensorflow/python:sparse_tensor",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "map_and_batch_dataset_serialization_test",
     size = "medium",
     srcs = ["map_and_batch_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python/data/experimental/ops:batching",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "map_dataset_serialization_test",
     size = "medium",
     srcs = ["map_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -391,11 +395,7 @@ tf_py_test(
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -403,15 +403,15 @@ tf_py_test(
     name = "matching_files_dataset_serialization_test",
     size = "small",
     srcs = ["matching_files_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/data/experimental/ops:matching_files",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -419,72 +419,72 @@ tf_py_test(
     name = "optimize_dataset_serialization_test",
     size = "small",
     srcs = ["optimize_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:optimization",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:optimization",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "rebatch_dataset_serialization_test",
     size = "small",
     srcs = ["rebatch_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:distribute",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:distribute",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "padded_batch_dataset_serialization_test",
     size = "medium",
     srcs = ["padded_batch_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "parallel_interleave_dataset_serialization_test",
     size = "medium",
     srcs = ["parallel_interleave_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python/data/experimental/ops:interleave_ops",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -492,9 +492,13 @@ tf_py_test(
     name = "parallel_map_dataset_serialization_test",
     size = "medium",
     srcs = ["parallel_map_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -504,11 +508,7 @@ tf_py_test(
         "//tensorflow/python:random_ops",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/data/ops:dataset_ops",
-    ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -516,39 +516,44 @@ tf_py_test(
     name = "parse_example_dataset_serialization_test",
     size = "medium",
     srcs = ["parse_example_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
+    ],
 )
 
 tf_py_test(
     name = "prefetch_dataset_serialization_test",
     size = "small",
     srcs = ["prefetch_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "range_dataset_serialization_test",
     size = "small",
     srcs = ["range_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dataset_ops_gen",
@@ -560,69 +565,69 @@ tf_py_test(
         "//tensorflow/python:variables",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "sample_from_datasets_serialization_test",
     size = "medium",
     srcs = ["sample_from_datasets_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:interleave_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:interleave_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "scan_dataset_serialization_test",
     size = "small",
     srcs = ["scan_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:scan_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:scan_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "sequence_dataset_serialization_test",
     size = "medium",
     srcs = ["sequence_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "serialization_integration_test",
     size = "small",
     srcs = ["serialization_integration_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_combinations",
         "//tensorflow/python:framework_ops",
@@ -631,52 +636,52 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "shard_dataset_serialization_test",
     size = "medium",
     srcs = ["shard_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "shuffle_and_repeat_dataset_serialization_test",
     size = "medium",
     srcs = ["shuffle_and_repeat_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:shuffle_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:shuffle_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "shuffle_dataset_serialization_test",
     size = "medium",
     srcs = ["shuffle_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_ops",
@@ -684,18 +689,18 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:iterator_ops",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "sql_dataset_serialization_test",
     size = "small",
     srcs = ["sql_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -703,18 +708,18 @@ tf_py_test(
         "//tensorflow/python/data/experimental/kernel_tests:sql_dataset_test_base",
         "//tensorflow/python/data/experimental/ops:readers",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "stats_dataset_serialization_test",
     size = "medium",
     srcs = ["stats_dataset_serialization_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",
+        "no_pip",
+        "no_windows",
+    ],
+    deps = [
         ":dataset_serialization_test_base",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -723,115 +728,110 @@ tf_py_test(
         "//tensorflow/python/data/experimental/ops:stats_ops",
         "//tensorflow/python/data/ops:dataset_ops",
     ],
-    tags = [
-        "no_oss",
-        "no_pip",
-        "no_windows",
-    ],
 )
 
 tf_py_test(
     name = "take_while_dataset_serialization_test",
     size = "medium",
     srcs = ["take_while_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:take_while_ops",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:take_while_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "textline_dataset_serialization_test",
     size = "medium",
     srcs = ["textline_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
-        "//tensorflow/python/data/ops:readers",
-    ],
     shard_count = 4,
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
+        "//tensorflow/python/data/ops:readers",
+    ],
 )
 
 tf_py_test(
     name = "tf_record_dataset_serialization_test",
     size = "medium",
     srcs = ["tf_record_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
-        "//tensorflow/python/data/ops:readers",
-    ],
     shard_count = 4,
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/kernel_tests:reader_dataset_ops_test_base",
+        "//tensorflow/python/data/ops:readers",
+    ],
 )
 
 tf_py_test(
     name = "unbatch_dataset_serialization_test",
     size = "medium",
     srcs = ["unbatch_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:batching",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:batching",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "unique_dataset_serialization_test",
     size = "small",
     srcs = ["unique_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/experimental/ops:unique",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/experimental/ops:unique",
+        "//tensorflow/python/data/ops:dataset_ops",
+    ],
 )
 
 tf_py_test(
     name = "zip_dataset_serialization_test",
     size = "small",
     srcs = ["zip_dataset_serialization_test.py"],
-    additional_deps = [
-        ":dataset_serialization_test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/data/ops:dataset_ops",
-    ],
     tags = [
         "no_oss",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":dataset_serialization_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+    ],
 )
diff --git a/tensorflow/python/data/kernel_tests/BUILD b/tensorflow/python/data/kernel_tests/BUILD
index 65f8f9a80f7..3f6906e8fd4 100644
--- a/tensorflow/python/data/kernel_tests/BUILD
+++ b/tensorflow/python/data/kernel_tests/BUILD
@@ -12,18 +12,18 @@ tf_py_test(
     name = "batch_test",
     size = "small",
     srcs = ["batch_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/ops/ragged",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -31,11 +31,8 @@ tf_py_test(
     name = "cache_test",
     size = "small",
     srcs = ["cache_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/data/ops:iterator_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -43,6 +40,9 @@ tf_py_test(
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:variables",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/data/ops:iterator_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -50,32 +50,32 @@ tf_py_test(
     name = "checkpoint_test",
     size = "medium",
     srcs = ["checkpoint_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    deps = [
         ":test_base",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/eager:context",
-        "//tensorflow/python/training/tracking:util",
         "//tensorflow/python:checkpoint_management",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/eager:context",
+        "//tensorflow/python/training/tracking:util",
     ],
-    grpc_enabled = True,
 )
 
 tf_py_test(
     name = "concatenate_test",
     size = "small",
     srcs = ["concatenate_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -83,22 +83,22 @@ tf_py_test(
     name = "dataset_test",
     size = "small",
     srcs = ["dataset_test.py"],
-    additional_deps = [
+    tags = [
+        "no_rocm",
+    ],
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/data/ops:readers",
-        "//tensorflow/python/data/util:nest",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python:script_ops",
         "//tensorflow/python:sparse_tensor",
-    ],
-    tags = [
-        "no_rocm",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/data/ops:readers",
+        "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -106,7 +106,7 @@ tf_py_test(
     name = "enumerate_test",
     size = "small",
     srcs = ["enumerate_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -121,9 +121,8 @@ tf_py_test(
     name = "filter_test",
     size = "small",
     srcs = ["filter_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -132,6 +131,7 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -139,7 +139,7 @@ tf_py_test(
     name = "fixed_length_record_dataset_test",
     size = "small",
     srcs = ["fixed_length_record_dataset_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -160,12 +160,10 @@ tf_py_test(
     name = "flat_map_test",
     size = "medium",
     srcs = ["flat_map_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python/data/ops:readers",
-        "//tensorflow/python/data/util:nest",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:session",
@@ -174,26 +172,28 @@ tf_py_test(
         "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:training",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/data/ops:readers",
+        "//tensorflow/python/data/util:nest",
         "//tensorflow/python/ops/ragged",
+        "//third_party/py/numpy",
     ],
-    grpc_enabled = True,
 )
 
 tf_py_test(
     name = "from_generator_test",
     size = "medium",
     srcs = ["from_generator_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python:script_ops",
-        "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:session",
+        "//tensorflow/python:tensor_array_ops",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -201,9 +201,8 @@ tf_py_test(
     name = "from_sparse_tensor_slices_test",
     size = "small",
     srcs = ["from_sparse_tensor_slices_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -217,6 +216,7 @@ tf_py_test(
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -224,9 +224,8 @@ tf_py_test(
     name = "from_tensors_test",
     size = "small",
     srcs = ["from_tensors_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -240,6 +239,7 @@ tf_py_test(
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/util:nest",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -247,11 +247,8 @@ tf_py_test(
     name = "from_tensor_slices_test",
     size = "small",
     srcs = ["from_tensor_slices_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_tensor",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -260,6 +257,9 @@ tf_py_test(
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/ops/ragged",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_tensor",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -267,18 +267,18 @@ tf_py_test(
     name = "interleave_test",
     size = "medium",
     srcs = ["interleave_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:script_ops",
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -286,11 +286,14 @@ tf_py_test(
     name = "iterator_cluster_test",
     size = "small",
     srcs = ["iterator_cluster_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    tags = [
+        "no_oss",  # Test flaky due to port collisions.
+        "no_windows",
+    ],
+    deps = [
         ":test_base",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/data/ops:iterator_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -304,11 +307,8 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:session",
         "//tensorflow/python:string_ops",
-    ],
-    grpc_enabled = True,
-    tags = [
-        "no_oss",  # Test flaky due to port collisions.
-        "no_windows",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/data/ops:iterator_ops",
     ],
 )
 
@@ -358,7 +358,7 @@ tf_py_test(
     name = "list_files_test",
     size = "small",
     srcs = ["list_files_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -373,12 +373,10 @@ tf_py_test(
     name = "map_test",
     size = "medium",
     srcs = ["map_test.py"],
-    additional_deps = [
+    shard_count = 4,
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -399,9 +397,11 @@ tf_py_test(
         "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:tensor_util",
         "//tensorflow/python:variable_scope",
+        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/ops/ragged",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    shard_count = 4,
 )
 
 cuda_py_test(
@@ -450,16 +450,16 @@ tf_py_test(
     name = "as_numpy_iterator_test",
     size = "small",
     srcs = ["as_numpy_iterator_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/ops/ragged:ragged_tensor_value",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:framework_combinations",
         "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/ops/ragged:ragged_tensor_value",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -488,12 +488,12 @@ tf_py_test(
     name = "options_test",
     size = "small",
     srcs = ["options_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python:client_testlib",
         "//tensorflow/python/data/experimental/ops:optimization_options",
         "//tensorflow/python/data/experimental/ops:threading_options",
-        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
     ],
 )
 
@@ -501,11 +501,8 @@ tf_py_test(
     name = "padded_batch_test",
     size = "small",
     srcs = ["padded_batch_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -515,6 +512,9 @@ tf_py_test(
         "//tensorflow/python:string_ops",
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python:util",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -522,14 +522,14 @@ tf_py_test(
     name = "prefetch_test",
     size = "small",
     srcs = ["prefetch_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dataset_ops_gen",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -537,12 +537,12 @@ tf_py_test(
     name = "range_test",
     size = "small",
     srcs = ["range_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python/data/ops:dataset_ops",
     ],
 )
 
@@ -568,14 +568,14 @@ tf_py_test(
     name = "repeat_test",
     size = "small",
     srcs = ["repeat_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -583,7 +583,7 @@ tf_py_test(
     name = "shard_test",
     size = "small",
     srcs = ["shard_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -595,10 +595,8 @@ tf_py_test(
     name = "shuffle_test",
     size = "small",
     srcs = ["shuffle_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -608,6 +606,8 @@ tf_py_test(
         "//tensorflow/python:random_seed",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/data/ops:iterator_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -615,14 +615,14 @@ tf_py_test(
     name = "skip_test",
     size = "small",
     srcs = ["skip_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -630,14 +630,14 @@ tf_py_test(
     name = "take_test",
     size = "small",
     srcs = ["take_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -645,16 +645,16 @@ tf_py_test(
     name = "text_line_dataset_test",
     size = "small",
     srcs = ["text_line_dataset_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//tensorflow/python/data/ops:iterator_ops",
-        "//tensorflow/python/data/ops:readers",
-        "//tensorflow/python/eager:context",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python:util",
+        "//tensorflow/python/data/ops:iterator_ops",
+        "//tensorflow/python/data/ops:readers",
+        "//tensorflow/python/eager:context",
     ],
 )
 
@@ -662,11 +662,8 @@ tf_py_test(
     name = "tf_record_dataset_test",
     size = "small",
     srcs = ["tf_record_dataset_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python/data/ops:iterator_ops",
-        "//tensorflow/python/data/ops:readers",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -674,6 +671,9 @@ tf_py_test(
         "//tensorflow/python:errors",
         "//tensorflow/python:lib",
         "//tensorflow/python:util",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//tensorflow/python/data/ops:iterator_ops",
+        "//tensorflow/python/data/ops:readers",
     ],
 )
 
@@ -699,9 +699,7 @@ tf_py_test(
     name = "unbatch_test",
     size = "medium",
     srcs = ["unbatch_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -717,6 +715,8 @@ tf_py_test(
         "//tensorflow/python/data/kernel_tests:test_base",
         "//tensorflow/python/data/ops:dataset_ops",
         "//tensorflow/python/ops/ragged",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -724,10 +724,8 @@ tf_py_test(
     name = "window_test",
     size = "medium",
     srcs = ["window_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -735,6 +733,8 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -742,13 +742,13 @@ tf_py_test(
     name = "zip_test",
     size = "small",
     srcs = ["zip_test.py"],
-    additional_deps = [
+    deps = [
         ":test_base",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
     ],
 )
diff --git a/tensorflow/python/distribute/BUILD b/tensorflow/python/distribute/BUILD
index be35886114d..16ed490dd8b 100644
--- a/tensorflow/python/distribute/BUILD
+++ b/tensorflow/python/distribute/BUILD
@@ -41,20 +41,20 @@ py_library(
 tf_py_test(
     name = "all_reduce_test",
     srcs = ["all_reduce_test.py"],
-    additional_deps = [
+    deps = [
         ":all_reduce",
-        "//third_party/py/numpy",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:constant_op",
-        "//tensorflow/python:client_testlib",
         "//tensorflow/python:platform",
         "//tensorflow/python:platform_test",
         "//tensorflow/python:state_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -379,10 +379,11 @@ py_library(
 tf_py_test(
     name = "mirrored_function_strategy_test",
     srcs = ["mirrored_function_strategy_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":distribute_lib",
-        ":strategy_combinations",
         ":mirrored_function_strategy",
+        ":strategy_combinations",
         ":values",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:framework_ops",
@@ -390,7 +391,6 @@ tf_py_test(
         "//tensorflow/python/eager:def_function",
         "//tensorflow/python/eager:test",
     ],
-    tags = ["no_pip"],
 )
 
 py_library(
@@ -830,7 +830,7 @@ tf_py_test(
     name = "sharded_variable_test",
     size = "small",
     srcs = ["sharded_variable_test.py"],
-    additional_deps = [
+    deps = [
         ":sharded_variable",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/distribute/cluster_resolver/BUILD b/tensorflow/python/distribute/cluster_resolver/BUILD
index 130cfa923ab..4ea961c273d 100644
--- a/tensorflow/python/distribute/cluster_resolver/BUILD
+++ b/tensorflow/python/distribute/cluster_resolver/BUILD
@@ -94,7 +94,8 @@ py_library(
 tf_py_test(
     name = "base_cluster_resolver_py_test",
     srcs = ["cluster_resolver_test.py"],
-    additional_deps = [
+    main = "cluster_resolver_test.py",
+    deps = [
         ":base_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -102,14 +103,14 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    main = "cluster_resolver_test.py",
 )
 
 tf_py_test(
     name = "gce_cluster_resolver_py_test",
     size = "small",
     srcs = ["gce_cluster_resolver_test.py"],
-    additional_deps = [
+    main = "gce_cluster_resolver_test.py",
+    deps = [
         ":gce_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -117,14 +118,15 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    main = "gce_cluster_resolver_test.py",
 )
 
 tf_py_test(
     name = "tfconfig_cluster_resolver_py_test",
     size = "small",
     srcs = ["tfconfig_cluster_resolver_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    main = "tfconfig_cluster_resolver_test.py",
+    deps = [
         ":tfconfig_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -132,33 +134,34 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    grpc_enabled = True,
-    main = "tfconfig_cluster_resolver_test.py",
 )
 
 tf_py_test(
     name = "tpu_cluster_resolver_py_test",
     size = "small",
     srcs = ["tpu_cluster_resolver_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    main = "tpu_cluster_resolver_test.py",
+    python_version = "PY3",
+    deps = [
         ":tpu_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
-        "//tensorflow/python/tpu/client:client",
+        "//tensorflow/python/tpu/client",
     ],
-    grpc_enabled = True,
-    main = "tpu_cluster_resolver_test.py",
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "tpu_cluster_resolver_py2_test",
     size = "small",
     srcs = ["tpu_cluster_resolver_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    main = "tpu_cluster_resolver_test.py",
+    python_version = "PY3",
+    deps = [
         ":tpu_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -166,16 +169,15 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    grpc_enabled = True,
-    main = "tpu_cluster_resolver_test.py",
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "slurm_cluster_resolver_py_test",
     size = "small",
     srcs = ["slurm_cluster_resolver_test.py"],
-    additional_deps = [
+    main = "slurm_cluster_resolver_test.py",
+    tags = [],
+    deps = [
         ":slurm_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -183,15 +185,14 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    main = "slurm_cluster_resolver_test.py",
-    tags = [],
 )
 
 tf_py_test(
     name = "kubernetes_cluster_resolver_py_test",
     size = "small",
     srcs = ["kubernetes_cluster_resolver_test.py"],
-    additional_deps = [
+    main = "kubernetes_cluster_resolver_test.py",
+    deps = [
         ":kubernetes_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -199,5 +200,4 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    main = "kubernetes_cluster_resolver_test.py",
 )
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index 5f8c1921f72..6c20340c7b9 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -107,23 +107,23 @@ filegroup(
 tf_py_test(
     name = "feature_column_test",
     srcs = ["feature_column_test.py"],
-    additional_deps = [
-        ":feature_column_test_main_lib",
-    ],
     tags = [
         "no_cuda_on_cpu_tap",
         "no_pip",
         "no_windows",
     ],
+    deps = [
+        ":feature_column_test_main_lib",
+    ],
 )
 
 tf_py_test(
     name = "dense_features_test",
     srcs = ["dense_features_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":feature_column_test_main_lib",
     ],
-    tags = ["no_pip"],
 )
 
 py_library(
@@ -158,22 +158,22 @@ py_library(
 tf_py_test(
     name = "feature_column_v2_test",
     srcs = ["feature_column_v2_test.py"],
-    additional_deps = [":feature_column_v2_test_main_lib"],
     shard_count = 5,
     tags = [
         "no_cuda_on_cpu_tap",
         "no_pip",
         "no_windows",
     ],
+    deps = [":feature_column_v2_test_main_lib"],
 )
 
 tf_py_test(
     name = "dense_features_v2_test",
     srcs = ["dense_features_v2_test.py"],
-    additional_deps = [
+    tags = ["no_pip"],
+    deps = [
         ":feature_column_v2_test_main_lib",
     ],
-    tags = ["no_pip"],
 )
 
 py_library(
@@ -221,10 +221,8 @@ py_library(
 tf_py_test(
     name = "sequence_feature_column_test",
     srcs = ["sequence_feature_column_test.py"],
-    additional_deps = [
+    deps = [
         ":feature_column_v2",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
@@ -234,6 +232,8 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:training",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -257,10 +257,10 @@ py_test(
 tf_py_test(
     name = "serialization_test",
     srcs = ["serialization_test.py"],
-    additional_deps = [
+    deps = [
         ":feature_column_v2",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:util",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD
index c51a7e6de81..b01daea128b 100755
--- a/tensorflow/python/keras/BUILD
+++ b/tensorflow/python/keras/BUILD
@@ -547,224 +547,224 @@ tf_py_test(
     name = "integration_test",
     size = "medium",
     srcs = ["integration_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:nn_ops",
-    ],
     python_version = "PY3",
     shard_count = 16,
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:nn_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "activations_test",
     size = "small",
     srcs = ["activations_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:nn_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "constraints_test",
     size = "small",
     srcs = ["constraints_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "data_adapter_test",
     size = "medium",
     srcs = ["engine/data_adapter_test.py"],
-    additional_deps = [
-        ":data_adapter",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":data_adapter",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "initializers_test",
     size = "small",
     srcs = ["initializers_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:init_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "regularizers_test",
     size = "medium",
     srcs = ["regularizers_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "optimizers_test",
     size = "medium",
     srcs = ["optimizers_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:training",
-    ],
     python_version = "PY3",
     shard_count = 8,
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:training",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "losses_test",
     size = "small",
     srcs = ["losses_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "metrics_functional_test",
     size = "small",
     srcs = ["metrics_functional_test.py"],
-    additional_deps = [
-        ":keras",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "metrics_test",
     size = "medium",
     srcs = ["metrics_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "metrics_confusion_matrix_test",
     size = "medium",
     srcs = ["metrics_confusion_matrix_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "metrics_correctness_test",
     size = "medium",
     srcs = ["metrics_correctness_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "temporal_sample_weights_correctness_test",
     size = "medium",
     srcs = ["temporal_sample_weights_correctness_test.py"],
-    additional_deps = [
-        ":keras",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 20,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "advanced_activations_test",
     size = "medium",
     srcs = ["layers/advanced_activations_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "tensorflow_op_layer_test",
     size = "medium",
     srcs = ["layers/tensorflow_op_layer_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    shard_count = 3,
+    deps = [
         ":keras",
         ":saving",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/eager:backprop",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/eager:def_function",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
-    shard_count = 3,
 )
 
 tf_py_test(
     name = "convolutional_recurrent_test",
     size = "medium",
     srcs = ["layers/convolutional_recurrent_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = ["no_rocm"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 cuda_py_test(
@@ -830,73 +830,73 @@ tf_py_test(
     name = "base_preprocessing_layer_test",
     size = "medium",
     srcs = ["engine/base_preprocessing_layer_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "pooling_test",
     size = "medium",
     srcs = ["layers/pooling_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 8,
     # TODO(b/127881287): Re-enable.
     tags = [
         "no_windows_gpu",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "core_test",
     size = "medium",
     srcs = ["layers/core_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 3,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "subclassed_layers_test",
     size = "medium",
     srcs = ["layers/subclassed_layers_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 3,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "dense_attention_test",
     size = "medium",
     srcs = ["layers/dense_attention_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
+        "//tensorflow/python:client_testlib",
         "//third_party/py/numpy",
         "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
     ],
-    python_version = "PY3",
 )
 
 cuda_py_test(
@@ -915,40 +915,40 @@ tf_py_test(
     name = "local_test",
     size = "medium",
     srcs = ["layers/local_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = ["no_windows"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "merge_test",
     size = "medium",
     srcs = ["layers/merge_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "noise_test",
     size = "small",
     srcs = ["layers/noise_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 cuda_py_test(
@@ -973,92 +973,92 @@ tf_py_test(
     name = "preprocessing_normalization_test",
     size = "small",
     srcs = ["layers/preprocessing/normalization_test.py"],
-    additional_deps = [
-        ":keras",
-        ":preprocessing_test_utils",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     main = "normalization_test.py",
     python_version = "PY3",
+    deps = [
+        ":keras",
+        ":preprocessing_test_utils",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "preprocessing_text_vectorization_test",
     size = "medium",
     srcs = ["layers/preprocessing/text_vectorization_test.py"],
-    additional_deps = [
+    main = "text_vectorization_test.py",
+    python_version = "PY3",
+    deps = [
         ":generic_utils",
         ":keras",
         ":preprocessing_test_utils",
+        "//tensorflow/python:client_testlib",
         "//tensorflow/python/ops/ragged:ragged_string_ops",
         "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
     ],
-    main = "text_vectorization_test.py",
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "simplernn_test",
     size = "medium",
     srcs = ["layers/simplernn_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "gru_test",
     size = "medium",
     srcs = ["layers/gru_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = ["notsan"],  # http://b/62136390
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "lstm_test",
     size = "medium",
     srcs = ["layers/lstm_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "noasan",  # times out b/63678675
         "notsan",  # http://b/62189182
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "recurrent_test",
     size = "medium",
     srcs = ["layers/recurrent_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 10,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 cuda_py_test(
@@ -1122,25 +1122,24 @@ tf_py_test(
     name = "serialization_test",
     size = "small",
     srcs = ["layers/serialization_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "kernelized_test",
     size = "small",
     srcs = ["layers/kernelized_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":backend",
         ":initializers",
         ":keras",
         ":layers",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -1153,87 +1152,82 @@ tf_py_test(
         "//tensorflow/python:random_seed",
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python/eager:context",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "wrappers_test",
     size = "large",
     srcs = ["layers/wrappers_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_concat_ops",
-    ],
     python_version = "PY3",
     shard_count = 6,
     tags = [
         "noasan",  # http://b/78599823
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/ops/ragged:ragged_concat_ops",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "rnn_cell_wrapper_v2_test",
     size = "medium",
     srcs = ["layers/rnn_cell_wrapper_v2_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "time_distributed_learning_phase_test",
     size = "small",
     srcs = ["layers/time_distributed_learning_phase_test.py"],
-    additional_deps = [
-        ":keras",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "noasan",  # http://b/78599823
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+    ],
 )
 
 tf_py_test(
     name = "scikit_learn_test",
     size = "small",
     srcs = ["wrappers/scikit_learn_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "data_utils_test",
     size = "medium",
     srcs = ["utils/data_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 6,
     tags = [
@@ -1241,53 +1235,59 @@ tf_py_test(
         "notsan",
         "optonly",  # times out
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "generic_utils_test",
     size = "small",
     srcs = ["utils/generic_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "version_utils_test",
     size = "small",
     srcs = ["utils/version_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "tf_utils_test",
     size = "small",
     srcs = ["utils/tf_utils_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
         "//tensorflow/python:client_testlib",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "composite_tensor_support_test",
     size = "medium",
     srcs = ["utils/composite_tensor_support_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    shard_count = 8,
+    tags = ["no_windows"],  # b/135752236
+    deps = [
         ":engine",
         ":layers",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python/ops/ragged:ragged_tensor",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
@@ -1296,53 +1296,53 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python/ops/ragged:ragged_tensor",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
-    shard_count = 8,
-    tags = ["no_windows"],  # b/135752236
 )
 
 tf_py_test(
     name = "io_utils_test",
     size = "small",
     srcs = ["utils/io_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_windows",  # TODO: needs investigation on Windows
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "np_utils_test",
     size = "small",
     srcs = ["utils/np_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "kernelized_utils_test",
     size = "small",
     srcs = ["utils/kernelized_utils_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":layers",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
 
 cuda_py_test(
@@ -1382,143 +1382,137 @@ tf_py_test(
     name = "vis_utils_test",
     size = "small",
     srcs = ["utils/vis_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "conv_utils_test",
     size = "small",
     srcs = ["utils/conv_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "image_test",
     size = "medium",
     srcs = ["preprocessing/image_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "sequence_test",
     size = "small",
     srcs = ["preprocessing/sequence_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "text_test",
     size = "small",
     srcs = ["preprocessing/text_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "callbacks_test",
     size = "medium",
     srcs = ["callbacks_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_oss",
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+        "@six_archive//:six",
+    ],
 )
 
 tf_py_test(
     name = "callbacks_v1_test",
     size = "medium",
     srcs = ["callbacks_v1_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "correctness_test",
     size = "medium",
     srcs = ["engine/correctness_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 2,
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "input_spec_test",
     size = "small",
     srcs = ["engine/input_spec_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_test",
     size = "medium",
     srcs = ["engine/training_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 20,
     tags = [
@@ -1526,6 +1520,12 @@ tf_py_test(
         "nomac",  # TODO(mihaimaruseac): b/127695564
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
@@ -1544,49 +1544,43 @@ tf_py_test(
     name = "training_dataset_test",
     size = "medium",
     srcs = ["engine/training_dataset_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_arrays_test",
     size = "medium",
     srcs = ["engine/training_arrays_test.py"],
-    additional_deps = [
-        ":keras",
-        ":layers",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
-        "//tensorflow/python/data/ops:dataset_ops",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_rocm",
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        ":layers",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/data/ops:dataset_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+        "@six_archive//:six",
+    ],
 )
 
 tf_py_test(
     name = "training_generator_test",
     size = "medium",
     srcs = ["engine/training_generator_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 6,
     tags = [
@@ -1594,95 +1588,101 @@ tf_py_test(
         "nomac",  # TODO(b/140193633): Re-enable this.
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_integration_test",
     size = "medium",
     srcs = ["engine/training_integration_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 30,
     tags = [
         "no_rocm",
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "feature_columns_integration_test",
     size = "medium",
     srcs = ["engine/feature_columns_integration_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/feature_column:feature_column_py",
-    ],
     python_version = "PY3",
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/feature_column:feature_column_py",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_eager_test",
     size = "medium",
     srcs = ["engine/training_eager_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_rocm",
         "nomac",  # TODO(mihaimaruseac): b/127695564
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_utils_test",
     size = "medium",
     srcs = ["engine/training_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_oss",  # TODO(b/135021748) reenable
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "training_v2_utils_test",
     size = "medium",
     srcs = ["engine/training_v2_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python/distribute:strategy_combinations",
-    ],
     python_version = "PY3",
     tags = [
         "no_oss",  # TODO(b/135021748) reenable
         "notsan",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/distribute:strategy_combinations",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 py_library(
@@ -1698,286 +1698,285 @@ tf_py_test(
     name = "model_subclassing_test",
     size = "medium",
     srcs = ["model_subclassing_test.py"],
-    additional_deps = [
-        ":model_subclassing_test_util",
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_windows",
         "notsan",
     ],
+    deps = [
+        ":keras",
+        ":model_subclassing_test_util",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "model_subclassing_compiled_test",
     size = "medium",
     srcs = ["model_subclassing_compiled_test.py"],
-    additional_deps = [
-        ":model_subclassing_test_util",
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_windows",
         "notsan",
     ],
+    deps = [
+        ":keras",
+        ":model_subclassing_test_util",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "custom_training_loop_test",
     size = "medium",
     srcs = ["custom_training_loop_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "network_test",
     size = "medium",
     srcs = ["engine/network_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 8,
     tags = [
         "no-internal-py3",
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "base_layer_test",
     size = "medium",
     srcs = ["engine/base_layer_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 8,
     tags = [
         "no_rocm",
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "base_layer_utils_test",
     srcs = ["engine/base_layer_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_rocm",
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "control_flow_test",
     size = "medium",
     srcs = ["engine/control_flow_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 8,
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "hdf5_format_test",
     size = "medium",
     srcs = ["saving/hdf5_format_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_windows",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "sequential_test",
     size = "medium",
     srcs = ["engine/sequential_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "nomac",  # TODO(mihaimaruseac): b/127695564
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "models_test",
     size = "medium",
     srcs = ["models_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:training",
-    ],
     python_version = "PY3",
     shard_count = 8,
     tags = ["notsan"],  # b/67509773
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:training",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "backend_test",
     size = "medium",
     srcs = ["backend_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:util",
-    ],
     python_version = "PY3",
     shard_count = 4,
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:util",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "backend_config_test",
     size = "medium",
     srcs = ["backend_config_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:util",
+        "//third_party/py/numpy",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "keras_parameterized_test",
     size = "small",
     srcs = ["keras_parameterized_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "save_test",
     size = "medium",
     srcs = ["saving/save_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/feature_column:feature_column_v2",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "saved_model_experimental_test",
     size = "medium",
     srcs = ["saving/saved_model_experimental_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_oss",  # TODO(b/119349471): Re-enable
         "no_windows",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "saved_model_test",
     size = "medium",
     srcs = ["saving/saved_model/saved_model_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python/distribute:mirrored_strategy",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     shard_count = 4,
     tags = [
         "no_windows",
     ],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/distribute:mirrored_strategy",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "saving_utils_test",
     size = "medium",
     srcs = ["saving/saving_utils_test.py"],
-    additional_deps = [
-        ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = ["notsan"],
+    deps = [
+        ":keras",
+        "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
     name = "metrics_utils_test",
     size = "small",
     srcs = ["utils/metrics_utils_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":keras",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python/ops/ragged:ragged_tensor",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:framework_test_lib",
@@ -1985,6 +1984,7 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_tensor",
+        "@absl_py//absl/testing:parameterized",
     ],
-    python_version = "PY3",
 )
diff --git a/tensorflow/python/keras/applications/BUILD b/tensorflow/python/keras/applications/BUILD
index 84ee2ddf53d..11c800c52a7 100644
--- a/tensorflow/python/keras/applications/BUILD
+++ b/tensorflow/python/keras/applications/BUILD
@@ -41,12 +41,12 @@ tf_py_test(
     name = "applications_test",
     size = "medium",
     srcs = ["applications_test.py"],
-    additional_deps = [
-        ":applications",
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python:client_testlib",
-    ],
     shard_count = 32,
+    deps = [
+        ":applications",
+        "//tensorflow/python:client_testlib",
+        "@absl_py//absl/testing:parameterized",
+    ],
 )
 
 tf_py_test(
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 402de69d0a8..45deed3382b 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -16,26 +16,26 @@ tf_py_test(
     name = "as_string_op_test",
     size = "small",
     srcs = ["as_string_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_windows"],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_windows"],
 )
 
 tf_py_test(
     name = "attention_ops_test",
     size = "small",
     srcs = ["attention_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:image_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -43,54 +43,53 @@ tf_py_test(
     name = "barrier_ops_test",
     size = "medium",  # NOTE(ebrevdo): This test is NOT small.
     srcs = ["barrier_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 20,
+    # TODO(b/129706424): Re-enable this test on Mac.
+    tags = ["no_mac"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//third_party/py/numpy",
     ],
-    shard_count = 20,
-    # TODO(b/129706424): Re-enable this test on Mac.
-    tags = ["no_mac"],
 )
 
 tf_py_test(
     name = "base64_ops_test",
     size = "small",
     srcs = ["base64_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["nomac"],  # b/35468214
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
     ],
-    tags = ["nomac"],  # b/35468214
 )
 
 tf_py_test(
     name = "batch_gather_op_test",
     srcs = ["batch_gather_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    tags = [
+        "no_gpu",  # b/127001953
+    ],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
-    ],
-    tags = [
-        "no_gpu",  # b/127001953
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
 tf_py_test(
     name = "batch_scatter_ops_test",
     srcs = ["batch_scatter_ops_test.py"],
-    additional_deps = [
-        "//tensorflow/python/eager:context",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -102,6 +101,7 @@ tf_py_test(
         "//tensorflow/python:session",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:variables",
+        "//tensorflow/python/eager:context",
     ],
 )
 
@@ -109,7 +109,7 @@ tf_py_test(
     name = "bcast_ops_test",
     size = "small",
     srcs = ["bcast_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:array_ops_gen",
         "//tensorflow/python:client_testlib",
     ],
@@ -183,13 +183,13 @@ tf_py_test(
     name = "candidate_sampler_ops_test",
     size = "small",
     srcs = ["candidate_sampler_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:candidate_sampling_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -197,8 +197,7 @@ tf_py_test(
     name = "checkpoint_ops_test",
     size = "medium",
     srcs = ["checkpoint_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:checkpoint_ops_gen",
         "//tensorflow/python:client_testlib",
@@ -212,6 +211,7 @@ tf_py_test(
         "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -240,23 +240,22 @@ tf_py_test(
     name = "clip_ops_test",
     size = "small",
     srcs = ["clip_ops_test.py"],
-    additional_deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:clip_ops",
-        "//tensorflow/python:framework_for_generated_wrappers",
-    ],
     tags = [
         "no_gpu",  # b/127001953
         "no_windows",
     ],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:clip_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+    ],
 )
 
 tf_py_test(
     name = "conditional_accumulator_test",
     size = "small",
     srcs = ["conditional_accumulator_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
@@ -265,6 +264,7 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -272,12 +272,12 @@ tf_py_test(
     name = "ctc_decoder_ops_test",
     size = "small",
     srcs = ["ctc_decoder_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:ctc_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -345,13 +345,13 @@ tf_py_test(
     name = "decode_csv_op_test",
     size = "small",
     srcs = ["decode_csv_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "//tensorflow/python/eager:context",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:parsing_ops",
+        "//tensorflow/python/eager:context",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -359,7 +359,7 @@ tf_py_test(
     name = "decode_png_op_test",
     size = "small",
     srcs = ["decode_png_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -372,7 +372,7 @@ tf_py_test(
     name = "decode_bmp_op_test",
     size = "small",
     srcs = ["decode_bmp_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -384,40 +384,40 @@ tf_py_test(
 tf_py_test(
     name = "decode_jpeg_op_test",
     srcs = ["decode_jpeg_op_test.py"],
-    additional_deps = [
+    data = ["//tensorflow/core:image_testdata"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:platform",
     ],
-    data = ["//tensorflow/core:image_testdata"],
 )
 
 tf_py_test(
     name = "decode_image_op_test",
     size = "small",
     srcs = ["decode_image_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    data = ["//tensorflow/core:image_testdata"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:io_ops",
         "//tensorflow/python:nn_grad",
+        "//third_party/py/numpy",
     ],
-    data = ["//tensorflow/core:image_testdata"],
 )
 
 tf_py_test(
     name = "decode_raw_op_test",
     size = "small",
     srcs = ["decode_raw_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:parsing_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -425,12 +425,12 @@ tf_py_test(
     name = "decode_compressed_op_test",
     size = "small",
     srcs = ["decode_compressed_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:parsing_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -450,13 +450,13 @@ tf_py_test(
     name = "draw_bounding_box_op_test",
     size = "small",
     srcs = ["draw_bounding_box_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:math_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -464,12 +464,12 @@ tf_py_test(
     name = "edit_distance_op_test",
     size = "small",
     srcs = ["edit_distance_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -477,8 +477,7 @@ tf_py_test(
     name = "fifo_queue_test",
     size = "small",
     srcs = ["fifo_queue_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
@@ -487,6 +486,7 @@ tf_py_test(
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:util",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -494,7 +494,7 @@ tf_py_test(
     name = "fingerprint_op_test",
     size = "small",
     srcs = ["fingerprint_op_test.py"],
-    additional_deps = [
+    deps = [
         "//third_party/py/numpy",
     ],
 )
@@ -503,45 +503,45 @@ tf_py_test(
     name = "fractional_avg_pool_op_test",
     size = "small",
     srcs = ["fractional_avg_pool_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 5,
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:nn_grad",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:nn_ops_gen",
+        "//third_party/py/numpy",
     ],
-    shard_count = 5,
 )
 
 tf_py_test(
     name = "fractional_max_pool_op_test",
     size = "small",
     srcs = ["fractional_max_pool_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 5,
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:nn_grad",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:nn_ops_gen",
+        "//third_party/py/numpy",
     ],
-    shard_count = 5,
 )
 
 tf_py_test(
     name = "identity_op_py_test",
     size = "small",
     srcs = ["identity_op_py_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:array_ops_gen",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -549,13 +549,13 @@ tf_py_test(
     name = "identity_n_op_py_test",
     size = "small",
     srcs = ["identity_n_op_py_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:array_ops_gen",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -575,7 +575,7 @@ tf_py_test(
     name = "record_input_test",
     size = "medium",
     srcs = ["record_input_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:io_ops",
@@ -587,7 +587,7 @@ tf_py_test(
     name = "io_ops_test",
     size = "small",
     srcs = ["io_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:io_ops",
         "//tensorflow/python:util",
@@ -598,12 +598,12 @@ tf_py_test(
     name = "listdiff_op_test",
     size = "small",
     srcs = ["listdiff_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:util",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -611,15 +611,15 @@ tf_py_test(
     name = "logging_ops_logging_level_test",
     size = "small",
     srcs = ["logging_ops_logging_level_test.py"],
-    additional_deps = [
+    tags = [
+        "no_windows",
+    ],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:logging_ops",
     ],
-    tags = [
-        "no_windows",
-    ],
 )
 
 cuda_py_test(
@@ -641,7 +641,8 @@ tf_py_test(
     name = "lookup_ops_test",
     size = "small",
     srcs = ["lookup_ops_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    deps = [
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -651,16 +652,13 @@ tf_py_test(
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:training",
     ],
-    grpc_enabled = True,
 )
 
 tf_py_test(
     name = "losses_test",
     size = "medium",
     srcs = ["losses_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "//tensorflow/python/ops/losses",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -671,6 +669,8 @@ tf_py_test(
         "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/ops/losses",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -678,25 +678,25 @@ tf_py_test(
     name = "matrix_exponential_op_test",
     size = "medium",
     srcs = ["matrix_exponential_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 16,
+    tags = ["no_windows_gpu"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:linalg_ops",
+        "//third_party/py/numpy",
     ],
-    shard_count = 16,
-    tags = ["no_windows_gpu"],
 )
 
 tf_py_test(
     name = "matrix_logarithm_op_test",
     size = "medium",
     srcs = ["matrix_logarithm_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:linalg_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -786,8 +786,7 @@ tf_py_test(
     name = "parsing_ops_test",
     size = "medium",
     srcs = ["parsing_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -796,6 +795,7 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -803,8 +803,7 @@ tf_py_test(
     name = "parse_single_example_op_test",
     size = "small",
     srcs = ["parse_single_example_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
@@ -813,6 +812,7 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -820,8 +820,7 @@ tf_py_test(
     name = "partitioned_variables_test",
     size = "small",
     srcs = ["partitioned_variables_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -830,6 +829,7 @@ tf_py_test(
         "//tensorflow/python:random_ops",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -837,14 +837,14 @@ tf_py_test(
     name = "priority_queue_test",
     size = "medium",
     srcs = ["priority_queue_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:nn_grad",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -871,12 +871,12 @@ tf_py_test(
     name = "regex_replace_op_test",
     size = "small",
     srcs = ["regex_replace_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -884,12 +884,12 @@ tf_py_test(
     name = "regex_full_match_op_test",
     size = "small",
     srcs = ["regex_full_match_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -897,7 +897,7 @@ tf_py_test(
     name = "save_restore_ops_test",
     size = "small",
     srcs = ["save_restore_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
@@ -929,24 +929,23 @@ tf_py_test(
     name = "segment_reduction_ops_test",
     size = "medium",
     srcs = ["segment_reduction_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 10,
+    deps = [
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:variables",
         "//tensorflow/python:nn_grad",
+        "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
-    shard_count = 10,
 )
 
 tf_py_test(
     name = "sparse_add_op_test",
     size = "small",
     srcs = ["sparse_add_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
@@ -954,6 +953,7 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_grad",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -961,13 +961,13 @@ tf_py_test(
     name = "sparse_concat_op_test",
     size = "small",
     srcs = ["sparse_concat_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -975,13 +975,13 @@ tf_py_test(
     name = "sparse_conditional_accumulator_test",
     size = "small",
     srcs = ["sparse_conditional_accumulator_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -989,14 +989,14 @@ tf_py_test(
     name = "sparse_reorder_op_test",
     size = "small",
     srcs = ["sparse_reorder_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_grad",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1004,13 +1004,13 @@ tf_py_test(
     name = "sparse_reshape_op_test",
     size = "small",
     srcs = ["sparse_reshape_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1018,11 +1018,11 @@ tf_py_test(
     name = "sparse_split_op_test",
     size = "small",
     srcs = ["sparse_split_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1030,12 +1030,12 @@ tf_py_test(
     name = "sparse_slice_op_test",
     size = "small",
     srcs = ["sparse_slice_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:sparse_grad",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1043,12 +1043,12 @@ tf_py_test(
     name = "sparse_to_dense_op_py_test",
     size = "small",
     srcs = ["sparse_to_dense_op_py_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1056,11 +1056,11 @@ tf_py_test(
     name = "sparsemask_op_test",
     size = "small",
     srcs = ["sparsemask_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1068,12 +1068,12 @@ tf_py_test(
     name = "string_format_op_test",
     size = "small",
     srcs = ["string_format_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:string_ops",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:string_ops",
     ],
 )
 
@@ -1081,7 +1081,7 @@ tf_py_test(
     name = "string_join_op_test",
     size = "small",
     srcs = ["string_join_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:string_ops",
     ],
@@ -1091,18 +1091,18 @@ tf_py_test(
     name = "string_split_op_test",
     size = "small",
     srcs = ["string_split_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:string_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
         "//tensorflow/python:util",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1110,11 +1110,7 @@ tf_py_test(
     name = "string_bytes_split_op_test",
     size = "small",
     srcs = ["string_bytes_split_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -1122,6 +1118,10 @@ tf_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:string_ops",
         "//tensorflow/python/ops/ragged",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1129,7 +1129,7 @@ tf_py_test(
     name = "string_length_op_test",
     size = "small",
     srcs = ["string_length_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
@@ -1140,13 +1140,13 @@ tf_py_test(
     name = "string_strip_op_test",
     size = "small",
     srcs = ["string_strip_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1154,13 +1154,13 @@ tf_py_test(
     name = "string_lower_op_test",
     size = "small",
     srcs = ["string_lower_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1168,13 +1168,13 @@ tf_py_test(
     name = "string_upper_op_test",
     size = "small",
     srcs = ["string_upper_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1182,12 +1182,12 @@ tf_py_test(
     name = "substr_op_test",
     size = "small",
     srcs = ["substr_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1222,7 +1222,7 @@ tf_py_test(
     name = "summary_v1_ops_test",
     size = "small",
     srcs = ["summary_v1_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -1235,15 +1235,15 @@ tf_py_test(
     name = "summary_v1_tensor_op_test",
     size = "small",
     srcs = ["summary_v1_tensor_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "@six_archive//:six",
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:summary",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
 )
 
@@ -1251,7 +1251,7 @@ tf_py_test(
     name = "template_test",
     size = "small",
     srcs = ["template_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
@@ -1301,7 +1301,7 @@ tf_py_test(
     name = "unicode_script_op_test",
     size = "small",
     srcs = ["unicode_script_op_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -1343,17 +1343,17 @@ tf_py_test(
     name = "unicode_encode_op_test",
     size = "small",
     srcs = ["unicode_encode_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//tensorflow/python/ops/ragged:ragged_tensor",
-        "//tensorflow/python/ops/ragged:ragged_tensor_value",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:errors",
+        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python/ops/ragged:ragged_factory_ops",
         "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python/ops/ragged:ragged_tensor",
+        "//tensorflow/python/ops/ragged:ragged_tensor_value",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1361,11 +1361,11 @@ tf_py_test(
     name = "unicode_transcode_op_test",
     size = "small",
     srcs = ["unicode_transcode_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1373,19 +1373,19 @@ tf_py_test(
     name = "unicode_decode_op_test",
     size = "small",
     srcs = ["unicode_decode_op_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//tensorflow/python/eager:context",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python/ops/ragged:ragged",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:string_ops",
+        "//tensorflow/python/eager:context",
+        "//tensorflow/python/ops/ragged",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -1393,10 +1393,10 @@ tf_py_test(
     name = "unique_op_test",
     size = "small",
     srcs = ["unique_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1404,8 +1404,8 @@ tf_py_test(
     name = "variable_scope_test",
     size = "small",
     srcs = ["variable_scope_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_windows"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:errors",
@@ -1414,25 +1414,24 @@ tf_py_test(
         "//tensorflow/python:init_ops",
         "//tensorflow/python:layers",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:variable_scope",
         "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:util",
+        "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/eager:function",
         "//tensorflow/python/eager:wrap_function",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_windows"],
 )
 
 tf_py_test(
     name = "variables_test",
     size = "small",
     srcs = ["variables_test.py"],
-    additional_deps = [
-        "@absl_py//absl/testing:parameterized",
-        "//third_party/py/numpy",
+    tags = ["no_windows"],  # b/133869052
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
@@ -1445,8 +1444,9 @@ tf_py_test(
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
         "//tensorflow/python/eager:function",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
     ],
-    tags = ["no_windows"],  # b/133869052
 )
 
 cuda_py_test(
@@ -1520,8 +1520,8 @@ tf_py_test(
     name = "reader_ops_test",
     size = "small",
     srcs = ["reader_ops_test.py"],
-    additional_deps = [
-        "@six_archive//:six",
+    data = ["//tensorflow/core:lmdb_testdata"],
+    deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
@@ -1531,8 +1531,8 @@ tf_py_test(
         "//tensorflow/python:lib",
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
+        "@six_archive//:six",
     ],
-    data = ["//tensorflow/core:lmdb_testdata"],
 )
 
 cuda_py_test(
@@ -1800,7 +1800,7 @@ tf_py_test(
     name = "control_flow_util_test",
     size = "small",
     srcs = ["control_flow_util_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:control_flow_ops_gen",
@@ -1813,7 +1813,7 @@ tf_py_test(
     name = "control_flow_util_v2_test",
     size = "small",
     srcs = ["control_flow_util_v2_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:cond_v2",
         "//tensorflow/python:constant_op",
@@ -2566,13 +2566,13 @@ tf_py_test(
     name = "sparse_serialization_ops_test",
     size = "small",
     srcs = ["sparse_serialization_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -2580,8 +2580,7 @@ tf_py_test(
     name = "sparse_tensors_map_ops_test",
     size = "small",
     srcs = ["sparse_tensors_map_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
@@ -2589,6 +2588,7 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -2957,16 +2957,16 @@ tf_py_test(
     name = "neon_depthwise_conv_op_test",
     size = "medium",
     srcs = ["neon_depthwise_conv_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_windows"],
+    deps = [
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:array_ops",
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_grad",
         "//tensorflow/python:nn_ops",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_windows"],
 )
 
 cuda_py_test(
@@ -3405,20 +3405,20 @@ tf_py_test(
     name = "eig_op_test",
     size = "medium",
     srcs = ["eig_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:linalg_ops",
-        "//tensorflow/python:math_ops",
-    ],
     data = ["//tensorflow/python/kernel_tests/testdata:self_adjoint_eig_op_test_files"],
     shard_count = 20,
     tags = [
         "no_rocm",  # flaky test
         "no_windows",
     ],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:linalg_ops",
+        "//tensorflow/python:math_ops",
+        "//third_party/py/numpy",
+    ],
     # b/127344411: xla_enable_strict_auto_jit = True,
 )
 
@@ -3553,8 +3553,7 @@ tf_py_test(
     name = "sets_test",
     size = "medium",
     srcs = ["sets_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:errors",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -3563,6 +3562,7 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:sets",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -3570,8 +3570,8 @@ tf_py_test(
     name = "weights_broadcast_test",
     size = "small",
     srcs = ["weights_broadcast_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 3,
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
@@ -3580,16 +3580,17 @@ tf_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:weights_broadcast_ops",
+        "//third_party/py/numpy",
     ],
-    shard_count = 3,
 )
 
 tf_py_test(
     name = "metrics_test",
     size = "medium",
     srcs = ["metrics_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    shard_count = 20,
+    tags = ["no_windows_gpu"],
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_grad",
@@ -3601,23 +3602,22 @@ tf_py_test(
         "//tensorflow/python:nn_grad",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
-    shard_count = 20,
-    tags = ["no_windows_gpu"],
 )
 
 tf_py_test(
     name = "confusion_matrix_test",
     size = "small",
     srcs = ["confusion_matrix_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:confusion_matrix",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:random_ops",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -3637,26 +3637,26 @@ tf_py_test(
     name = "sparse_cross_op_test",
     size = "small",
     srcs = ["sparse_cross_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    tags = ["no_windows"],
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:sparse_ops",
+        "//third_party/py/numpy",
     ],
-    tags = ["no_windows"],
 )
 
 tf_py_test(
     name = "garbage_collection_test",
     size = "small",
     srcs = ["garbage_collection_test.py"],
-    additional_deps = [
-        "//tensorflow/python/eager:context",
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:resource_variable_ops",
-        "//tensorflow/python:dtypes",
         "//tensorflow/python:tensor_array_ops",
-        "//tensorflow/python:client_testlib",
+        "//tensorflow/python/eager:context",
     ],
 )
 
@@ -3670,16 +3670,16 @@ tf_py_test(
     name = "ackermann_test",
     size = "small",
     srcs = ["ackermann_test.py"],
-    additional_deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform",
-    ],
     data = [":ackermann_op.so"],
     tags = [
         "no_pip",
         "notap",
     ],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform",
+    ],
 )
 
 tf_custom_op_library(
@@ -3691,17 +3691,17 @@ tf_py_test(
     name = "duplicate_op_test",
     size = "small",
     srcs = ["duplicate_op_test.py"],
-    additional_deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform",
-    ],
     data = [":duplicate_op.so"],
     tags = [
         "no_pip",
         "notap",
     ],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform",
+    ],
 )
 
 tf_custom_op_library(
@@ -3713,17 +3713,17 @@ tf_py_test(
     name = "invalid_op_test",
     size = "small",
     srcs = ["invalid_op_test.py"],
-    additional_deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform",
-    ],
     data = [":invalid_op.so"],
     tags = [
         "no_pip",
         "notap",
     ],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform",
+    ],
 )
 
 cuda_py_test(
diff --git a/tensorflow/python/kernel_tests/boosted_trees/BUILD b/tensorflow/python/kernel_tests/boosted_trees/BUILD
index d19284bbe55..5b318324d4c 100644
--- a/tensorflow/python/kernel_tests/boosted_trees/BUILD
+++ b/tensorflow/python/kernel_tests/boosted_trees/BUILD
@@ -24,7 +24,7 @@ tf_py_test(
     name = "resource_ops_test",
     size = "small",
     srcs = ["resource_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:boosted_trees_ops",
         "//tensorflow/python:framework_ops",
@@ -39,12 +39,12 @@ tf_py_test(
     name = "prediction_ops_test",
     size = "small",
     srcs = ["prediction_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:boosted_trees_ops",
-        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:constant_op",
+        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:resources",
     ],
 )
@@ -53,8 +53,7 @@ tf_py_test(
     name = "stats_ops_test",
     size = "medium",
     srcs = ["stats_ops_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:boosted_trees_ops",
         "//tensorflow/python:constant_op",
@@ -62,6 +61,7 @@ tf_py_test(
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -69,7 +69,7 @@ tf_py_test(
     name = "training_ops_test",
     size = "small",
     srcs = ["training_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:boosted_trees_ops",
@@ -83,7 +83,7 @@ tf_py_test(
     name = "quantile_ops_test",
     size = "small",
     srcs = ["quantile_ops_test.py"],
-    additional_deps = [
+    deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:boosted_trees_ops",
         "//tensorflow/python:constant_op",
diff --git a/tensorflow/python/kernel_tests/proto/BUILD b/tensorflow/python/kernel_tests/proto/BUILD
index 389612c9827..d9643f3d125 100644
--- a/tensorflow/python/kernel_tests/proto/BUILD
+++ b/tensorflow/python/kernel_tests/proto/BUILD
@@ -19,11 +19,6 @@ tf_py_test(
     name = "decode_proto_op_test",
     size = "small",
     srcs = ["decode_proto_op_test.py"],
-    additional_deps = [
-        ":decode_proto_op_test_base",
-        ":py_test_deps",
-        "//tensorflow/python:proto_ops",
-    ],
     data = if_static(
         [],
         otherwise = [":libtestexample.so"],
@@ -33,17 +28,17 @@ tf_py_test(
         "no_pip",  # TODO(b/78026780)
         "no_windows",  # TODO(b/78028010)
     ],
+    deps = [
+        ":decode_proto_op_test_base",
+        ":py_test_deps",
+        "//tensorflow/python:proto_ops",
+    ],
 )
 
 tf_py_test(
     name = "encode_proto_op_test",
     size = "small",
     srcs = ["encode_proto_op_test.py"],
-    additional_deps = [
-        ":encode_proto_op_test_base",
-        ":py_test_deps",
-        "//tensorflow/python:proto_ops",
-    ],
     data = if_static(
         [],
         otherwise = [":libtestexample.so"],
@@ -53,6 +48,11 @@ tf_py_test(
         "no_pip",  # TODO(b/78026780)
         "no_windows",  # TODO(b/78028010)
     ],
+    deps = [
+        ":encode_proto_op_test_base",
+        ":py_test_deps",
+        "//tensorflow/python:proto_ops",
+    ],
 )
 
 py_library(
@@ -122,13 +122,13 @@ tf_py_test(
     name = "descriptor_source_test",
     size = "small",
     srcs = ["descriptor_source_test.py"],
-    additional_deps = [
-        ":descriptor_source_test_base",
-        "//tensorflow/python:proto_ops",
-        "//tensorflow/python:client_testlib",
-    ],
     python_version = "PY3",
     tags = [
         "no_pip",
     ],
+    deps = [
+        ":descriptor_source_test_base",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:proto_ops",
+    ],
 )
diff --git a/tensorflow/python/kernel_tests/random/BUILD b/tensorflow/python/kernel_tests/random/BUILD
index 2e3b6ff63d3..6e68f7f12a6 100644
--- a/tensorflow/python/kernel_tests/random/BUILD
+++ b/tensorflow/python/kernel_tests/random/BUILD
@@ -24,14 +24,14 @@ tf_py_test(
     name = "random_shuffle_queue_test",
     size = "small",
     srcs = ["random_shuffle_queue_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
+    deps = [
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -151,18 +151,18 @@ tf_py_test(
     name = "random_binomial_test",
     size = "medium",
     srcs = ["random_binomial_test.py"],
-    additional_deps = [
+    shard_count = 3,
+    tags = ["no_oss"],
+    deps = [
         ":util",
-        "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:platform",
         "//tensorflow/python:stateful_random_ops",
+        "//third_party/py/numpy",
     ],
-    shard_count = 3,
-    tags = ["no_oss"],
 )
 
 cuda_py_test(
diff --git a/tensorflow/python/profiler/BUILD b/tensorflow/python/profiler/BUILD
index 8fba7080898..88478b9d968 100644
--- a/tensorflow/python/profiler/BUILD
+++ b/tensorflow/python/profiler/BUILD
@@ -100,7 +100,8 @@ tf_py_test(
     name = "tfprof_logger_test",
     size = "small",
     srcs = ["tfprof_logger_test.py"],
-    additional_deps = [
+    python_version = "PY3",
+    deps = [
         ":tfprof_logger",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/core/profiler:protos_all_py",
@@ -110,7 +111,6 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
     ],
-    python_version = "PY3",
 )
 
 py_library(
diff --git a/tensorflow/python/saved_model/BUILD b/tensorflow/python/saved_model/BUILD
index b8a059ef148..e8132813d4f 100644
--- a/tensorflow/python/saved_model/BUILD
+++ b/tensorflow/python/saved_model/BUILD
@@ -100,12 +100,11 @@ tf_py_test(
     name = "loader_test",
     size = "small",
     srcs = ["loader_test.py"],
-    additional_deps = [
+    deps = [
         ":builder",
         ":loader",
         ":signature_def_utils",
         ":utils",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
@@ -115,6 +114,7 @@ tf_py_test(
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -155,7 +155,9 @@ tf_py_test(
     name = "saved_model_test",
     size = "small",
     srcs = ["saved_model_test.py"],
-    additional_deps = [
+    data = ["//tensorflow/cc/saved_model:saved_model_half_plus_two"],
+    tags = ["no_windows"],
+    deps = [
         ":builder",
         ":constants",
         ":loader",
@@ -178,8 +180,6 @@ tf_py_test(
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
     ],
-    data = ["//tensorflow/cc/saved_model:saved_model_half_plus_two"],
-    tags = ["no_windows"],
 )
 
 py_library(
@@ -204,7 +204,7 @@ tf_py_test(
     name = "utils_test",
     size = "small",
     srcs = ["utils_test.py"],
-    additional_deps = [
+    deps = [
         ":utils",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
@@ -234,7 +234,7 @@ tf_py_test(
     name = "signature_def_utils_test",
     size = "small",
     srcs = ["signature_def_utils_test.py"],
-    additional_deps = [
+    deps = [
         ":signature_constants",
         ":signature_def_utils",
         ":utils",
@@ -249,7 +249,7 @@ tf_py_test(
     name = "simple_save_test",
     size = "small",
     srcs = ["simple_save_test.py"],
-    additional_deps = [
+    deps = [
         ":loader",
         ":signature_constants",
         ":simple_save",
@@ -320,19 +320,19 @@ py_library(
 tf_py_test(
     name = "save_test",
     srcs = ["save_test.py"],
-    additional_deps = [
+    tags = ["no_rocm"],
+    deps = [
         ":loader",
         ":save",
         ":save_options",
         ":signature_constants",
         ":tag_constants",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:error_interpolation",
         "//tensorflow/python/eager:def_function",
         "//tensorflow/python/eager:test",
+        "@absl_py//absl/testing:parameterized",
     ],
-    tags = ["no_rocm"],
 )
 
 py_library(
@@ -412,14 +412,13 @@ cuda_py_test(
 tf_py_test(
     name = "load_v1_in_v2_test",
     srcs = ["load_v1_in_v2_test.py"],
-    additional_deps = [
+    deps = [
         ":builder",
         ":load",
         ":save",
         ":signature_def_utils",
         ":simple_save",
         ":utils",
-        "@absl_py//absl/testing:parameterized",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
@@ -428,10 +427,11 @@ tf_py_test(
         "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:session",
         "//tensorflow/python:tensor_spec",
+        "//tensorflow/python:variables",
         "//tensorflow/python/eager:def_function",
         "//tensorflow/python/eager:test",
-        "//tensorflow/python/training/tracking:tracking",
-        "//tensorflow/python:variables",
+        "//tensorflow/python/training/tracking",
+        "@absl_py//absl/testing:parameterized",
     ],
 )
 
@@ -449,7 +449,7 @@ py_library(
 tf_py_test(
     name = "revived_types_test",
     srcs = ["revived_types_test.py"],
-    additional_deps = [
+    deps = [
         ":revived_types",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
@@ -501,7 +501,7 @@ py_library(
 tf_py_test(
     name = "nested_structure_coder_test",
     srcs = ["nested_structure_coder_test.py"],
-    additional_deps = [
+    deps = [
         ":nested_structure_coder",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:framework",
diff --git a/tensorflow/python/tpu/BUILD b/tensorflow/python/tpu/BUILD
index 0f708fb420e..82dbc04de0b 100644
--- a/tensorflow/python/tpu/BUILD
+++ b/tensorflow/python/tpu/BUILD
@@ -257,37 +257,37 @@ tf_py_test(
     name = "datasets_test",
     size = "medium",
     srcs = ["datasets_test.py"],
-    additional_deps = [
-        "//tensorflow/python:client_testlib",
-        ":datasets",
-    ],
     grpc_enabled = True,
     shard_count = 4,
     tags = ["no_oss"],
+    deps = [
+        ":datasets",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 tf_py_test(
     name = "tpu_test",
     size = "small",
     srcs = ["tpu_test.py"],
-    additional_deps = [
+    tags = [
+        "no_oss",  # TODO(b/131157871): Reenable in OSS when fixed
+        "no_windows",  # TODO: needs investigation on Windows
+    ],
+    deps = [
         ":tpu",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework",
         "//tensorflow/python:layers",
     ],
-    tags = [
-        "no_oss",  # TODO(b/131157871): Reenable in OSS when fixed
-        "no_windows",  # TODO: needs investigation on Windows
-    ],
 )
 
 tf_py_test(
     name = "tpu_sharding_test",
     size = "small",
     srcs = ["tpu_sharding_test.py"],
-    additional_deps = [
+    deps = [
         ":tpu",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
@@ -298,7 +298,7 @@ tf_py_test(
     name = "bfloat16_test",
     size = "small",
     srcs = ["bfloat16_test.py"],
-    additional_deps = [
+    deps = [
         ":tpu",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
@@ -309,7 +309,7 @@ tf_py_test(
     name = "tpu_infeed_test",
     size = "small",
     srcs = ["tpu_infeed_test.py"],
-    additional_deps = [
+    deps = [
         ":tpu",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_test_lib",
@@ -320,7 +320,7 @@ tf_py_test(
     name = "topology_test",
     size = "medium",
     srcs = ["topology_test.py"],
-    additional_deps = [
+    deps = [
         ":tpu",
         "//tensorflow/python:framework_test_lib",
     ],
@@ -395,9 +395,9 @@ tf_py_test(
     srcs = [
         "feature_column_test.py",
     ],
-    additional_deps = [
+    main = "feature_column_test.py",
+    deps = [
         ":feature_column",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
@@ -408,8 +408,8 @@ tf_py_test(
         "//tensorflow/python:variables",
         "//tensorflow/python/feature_column",
         "//tensorflow/python/feature_column:feature_column_py",
+        "//third_party/py/numpy",
     ],
-    main = "feature_column_test.py",
 )
 
 tf_py_test(
@@ -417,9 +417,9 @@ tf_py_test(
     srcs = [
         "feature_column_v2_test.py",
     ],
-    additional_deps = [
+    main = "feature_column_v2_test.py",
+    deps = [
         ":feature_column_v2",
-        "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
@@ -430,8 +430,8 @@ tf_py_test(
         "//tensorflow/python:variables",
         "//tensorflow/python/feature_column",
         "//tensorflow/python/feature_column:feature_column_py",
+        "//third_party/py/numpy",
     ],
-    main = "feature_column_v2_test.py",
 )
 
 tf_proto_library(
diff --git a/tensorflow/python/tpu/client/BUILD b/tensorflow/python/tpu/client/BUILD
index fb6d42304dc..3201c7fccb0 100644
--- a/tensorflow/python/tpu/client/BUILD
+++ b/tensorflow/python/tpu/client/BUILD
@@ -37,7 +37,10 @@ tf_py_test(
     name = "client_py_test",
     size = "small",
     srcs = ["client_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    main = "client_test.py",
+    python_version = "PY3",
+    deps = [
         ":client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -45,16 +48,16 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    grpc_enabled = True,
-    main = "client_test.py",
-    python_version = "PY3",
 )
 
 tf_py_test(
     name = "client_py2_test",
     size = "small",
     srcs = ["client_test.py"],
-    additional_deps = [
+    grpc_enabled = True,
+    main = "client_test.py",
+    python_version = "PY2",
+    deps = [
         ":client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -62,7 +65,4 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training_server_lib",
     ],
-    grpc_enabled = True,
-    main = "client_test.py",
-    python_version = "PY2",
 )
diff --git a/tensorflow/python/training/tracking/BUILD b/tensorflow/python/training/tracking/BUILD
index bff8d77c655..3d646075426 100644
--- a/tensorflow/python/training/tracking/BUILD
+++ b/tensorflow/python/training/tracking/BUILD
@@ -39,7 +39,7 @@ py_library(
 tf_py_test(
     name = "base_test",
     srcs = ["base_test.py"],
-    additional_deps = [
+    deps = [
         ":base",
         "//tensorflow/python:client_testlib",
     ],
@@ -58,7 +58,7 @@ py_library(
 tf_py_test(
     name = "tracking_test",
     srcs = ["tracking_test.py"],
-    additional_deps = [
+    deps = [
         ":base",
         ":tracking",
         "//tensorflow/python:client_testlib",
@@ -86,7 +86,11 @@ py_library(
 tf_py_test(
     name = "data_structures_test",
     srcs = ["data_structures_test.py"],
-    additional_deps = [
+    tags = [
+        "no_windows",
+        "nomac",
+    ],
+    deps = [
         ":data_structures",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:framework_test_lib",
@@ -97,10 +101,6 @@ tf_py_test(
         "//tensorflow/python/keras:engine",
         "//tensorflow/python/keras:layers",
     ],
-    tags = [
-        "no_windows",
-        "nomac",
-    ],
 )
 
 py_library(
@@ -159,14 +159,12 @@ py_library(
 tf_py_test(
     name = "util_test",
     srcs = ["util_test.py"],
-    additional_deps = [
+    tags = ["notsan"],  # b/74395663
+    deps = [
         ":base",
         ":graph_view",
         ":tracking",
         ":util",
-        "@absl_py//absl/testing:parameterized",
-        "@six_archive//:six",
-        "//tensorflow/python/keras/optimizer_v2",
         "//tensorflow/python:checkpoint_management",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
@@ -184,6 +182,7 @@ tf_py_test(
         "//tensorflow/python:template",
         "//tensorflow/python:training_util",
         "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
         "//tensorflow/python/eager:backprop",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/eager:def_function",
@@ -191,9 +190,10 @@ tf_py_test(
         "//tensorflow/python/keras:backend",
         "//tensorflow/python/keras:engine",
         "//tensorflow/python/keras:layers",
-        "//tensorflow/python:variables",
+        "//tensorflow/python/keras/optimizer_v2",
+        "@absl_py//absl/testing:parameterized",
+        "@six_archive//:six",
     ],
-    tags = ["notsan"],  # b/74395663
 )
 
 tf_xla_py_test(
@@ -224,13 +224,14 @@ tf_xla_py_test(
 tf_py_test(
     name = "util_with_v1_optimizers_test",
     srcs = ["util_with_v1_optimizers_test.py"],
-    additional_deps = [
+    tags = [
+        "notsan",  # b/74395663
+    ],
+    deps = [
         ":base",
         ":graph_view",
         ":tracking",
         ":util",
-        "@absl_py//absl/testing:parameterized",
-        "@six_archive//:six",
         "//tensorflow/python:checkpoint_management",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:control_flow_ops",
@@ -254,9 +255,8 @@ tf_py_test(
         "//tensorflow/python/eager:test",
         "//tensorflow/python/keras:engine",
         "//tensorflow/python/keras:layers",
-    ],
-    tags = [
-        "notsan",  # b/74395663
+        "@absl_py//absl/testing:parameterized",
+        "@six_archive//:six",
     ],
 )
 
@@ -272,22 +272,22 @@ py_library(
 tf_py_test(
     name = "python_state_test",
     srcs = ["python_state_test.py"],
-    additional_deps = [
+    deps = [
         ":base",
         ":util",
-        "//tensorflow/python/module",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python/module",
     ],
 )
 
 tf_py_test(
     name = "benchmarks_test",
     srcs = ["benchmarks_test.py"],
-    additional_deps = [
+    deps = [
         ":util",
-        "//tensorflow/python:platform_test",
         "//tensorflow/python:framework_ops",
+        "//tensorflow/python:platform_test",
     ],
 )
 
diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD
index 06390ce9945..198859598eb 100644
--- a/tensorflow/tools/graph_transforms/BUILD
+++ b/tensorflow/tools/graph_transforms/BUILD
@@ -339,7 +339,9 @@ tf_py_test(
     name = "transform_graph_py_test",
     size = "small",
     srcs = ["python/transform_graph_test.py"],
-    additional_deps = [
+    main = "python/transform_graph_test.py",
+    tags = ["v1only"],
+    deps = [
         ":transform_graph_py",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
@@ -347,6 +349,4 @@ tf_py_test(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:variables",
     ],
-    main = "python/transform_graph_test.py",
-    tags = ["v1only"],
 )