diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD
index 0d2c9f2d195..7606e193a90 100644
--- a/tensorflow/cc/BUILD
+++ b/tensorflow/cc/BUILD
@@ -34,7 +34,6 @@ cc_library(
 
 tf_cc_test(
     name = "framework_gradients_test",
-    size = "small",
     srcs = ["framework/gradients_test.cc"],
     deps = [
         ":cc_ops",
@@ -70,7 +69,6 @@ cc_library(
 
 tf_cc_test(
     name = "framework_gradient_checker_test",
-    size = "small",
     srcs = ["framework/gradient_checker_test.cc"],
     deps = [
         ":cc_ops",
@@ -153,7 +151,6 @@ cc_library_with_android_deps(
 
 tf_cc_test(
     name = "framework_scope_test",
-    size = "small",
     srcs = ["framework/scope_test.cc"],
     deps = [
         ":ops",
@@ -183,7 +180,6 @@ cc_library_with_android_deps(
 
 tf_cc_test(
     name = "client_client_session_test",
-    size = "small",
     srcs = ["client/client_session_test.cc"],
     deps = [
         ":cc_ops",
@@ -218,7 +214,6 @@ cc_library_with_android_deps(
 
 tf_cc_test(
     name = "ops_const_op_test",
-    size = "small",
     srcs = ["ops/const_op_test.cc"],
     deps = [
         ":const_op",
@@ -290,7 +285,6 @@ cc_library(
 
 tf_cc_test(
     name = "gradients_array_grad_test",
-    size = "small",
     srcs = ["gradients/array_grad_test.cc"],
     deps = [
         ":array_grad",
@@ -320,7 +314,6 @@ cc_library(
 
 tf_cc_test(
     name = "gradients_math_grad_test",
-    size = "small",
     srcs = ["gradients/math_grad_test.cc"],
     deps = [
         ":cc_ops",
@@ -349,7 +342,6 @@ cc_library(
 
 tf_cc_test(
     name = "gradients_nn_grad_test",
-    size = "small",
     srcs = ["gradients/nn_grad_test.cc"],
     deps = [
         ":cc_ops",
@@ -429,7 +421,6 @@ tf_gen_op_wrappers_cc(
 
 tf_cc_test(
     name = "framework_cc_ops_test",
-    size = "small",
     srcs = ["framework/cc_ops_test.cc"],
     deps = [
         ":cc_ops",
@@ -635,7 +626,6 @@ cc_library(
 
 tf_cc_test(
     name = "coordinator_test",
-    size = "small",
     srcs = ["training/coordinator_test.cc"],
     deps = [
         ":cc_ops",
diff --git a/tensorflow/compiler/aot/BUILD b/tensorflow/compiler/aot/BUILD
index f956602ba22..9909e88e649 100644
--- a/tensorflow/compiler/aot/BUILD
+++ b/tensorflow/compiler/aot/BUILD
@@ -20,7 +20,6 @@ cc_library(
 
 cc_test(
     name = "runtime_test",
-    size = "small",
     srcs = ["runtime_test.cc"],
     deps = [
         ":runtime",
@@ -89,7 +88,6 @@ cc_library(
 
 cc_test(
     name = "codegen_test",
-    size = "small",
     srcs = ["codegen_test.cc"],
     data = ["codegen_test_h.golden"],
     deps = [
@@ -103,7 +101,6 @@ cc_test(
 
 cc_test(
     name = "tfcompile_util_test",
-    size = "small",
     srcs = ["tfcompile_util_test.cc"],
     deps = [
         ":tfcompile_lib",
diff --git a/tensorflow/compiler/tf2xla/BUILD b/tensorflow/compiler/tf2xla/BUILD
index a8d743c0716..13fc2330540 100644
--- a/tensorflow/compiler/tf2xla/BUILD
+++ b/tensorflow/compiler/tf2xla/BUILD
@@ -98,7 +98,6 @@ cc_library(
 
 cc_test(
     name = "xla_compiler_test",
-    size = "small",
     srcs = ["xla_compiler_test.cc"],
     deps = [
         ":xla_compiler",
@@ -121,7 +120,6 @@ cc_test(
 
 cc_test(
     name = "str_util_test",
-    size = "small",
     srcs = [
         "str_util_test.cc",
     ],
@@ -135,7 +133,6 @@ cc_test(
 
 cc_test(
     name = "literal_util_test",
-    size = "small",
     srcs = [
         "literal_util_test.cc",
     ],
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 49f7bcb3406..eb92db03b24 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -193,7 +193,6 @@ cc_library(
 
 cc_test(
     name = "util_test",
-    size = "small",
     srcs = ["util_test.cc"],
     deps = [
         ":test",
@@ -233,7 +232,6 @@ cc_library(
 
 cc_test(
     name = "shape_util_test",
-    size = "small",
     srcs = ["shape_util_test.cc"],
     deps = [
         ":shape_util",
@@ -248,7 +246,6 @@ cc_test(
 
 cc_test(
     name = "layout_util_test",
-    size = "small",
     srcs = ["layout_util_test.cc"],
     deps = [
         ":shape_util",
@@ -260,7 +257,6 @@ cc_test(
 
 cc_test(
     name = "index_util_test",
-    size = "small",
     srcs = ["index_util_test.cc"],
     deps = [
         ":shape_util",
@@ -290,7 +286,6 @@ cc_library(
 
 cc_test(
     name = "literal_util_test",
-    size = "small",
     srcs = ["literal_util_test.cc"],
     deps = [
         ":array3d",
@@ -341,7 +336,6 @@ cc_library(
 
 cc_test(
     name = "array2d_test",
-    size = "small",
     srcs = ["array2d_test.cc"],
     deps = [
         ":array2d",
@@ -362,7 +356,6 @@ cc_library(
 
 cc_test(
     name = "array3d_test",
-    size = "small",
     srcs = ["array3d_test.cc"],
     deps = [
         ":array3d",
@@ -385,7 +378,6 @@ cc_library(
 
 cc_test(
     name = "array4d_test",
-    size = "small",
     srcs = ["array4d_test.cc"],
     deps = [
         ":array4d",
@@ -453,7 +445,6 @@ cc_library(
 
 cc_test(
     name = "text_literal_reader_test",
-    size = "small",
     srcs = ["text_literal_reader_test.cc"],
     deps = [
         ":literal_util",
@@ -484,7 +475,6 @@ cc_library(
 
 cc_test(
     name = "text_literal_writer_test",
-    size = "small",
     srcs = ["text_literal_writer_test.cc"],
     deps = [
         ":literal_util",
@@ -513,7 +503,6 @@ cc_library(
 
 cc_test(
     name = "shape_tree_test",
-    size = "small",
     srcs = ["shape_tree_test.cc"],
     deps = [
         ":shape_tree",
@@ -574,7 +563,6 @@ cc_library(
 
 cc_test(
     name = "reference_util_test",
-    size = "small",
     srcs = ["reference_util_test.cc"],
     deps = [
         ":array2d",
diff --git a/tensorflow/compiler/xla/client/BUILD b/tensorflow/compiler/xla/client/BUILD
index a998b91c89d..3405d6c39e2 100644
--- a/tensorflow/compiler/xla/client/BUILD
+++ b/tensorflow/compiler/xla/client/BUILD
@@ -46,7 +46,6 @@ cc_library(
 
 cc_test(
     name = "padding_test",
-    size = "small",
     srcs = ["padding_test.cc"],
     deps = [
         ":padding",
diff --git a/tensorflow/compiler/xla/legacy_flags/BUILD b/tensorflow/compiler/xla/legacy_flags/BUILD
index 7977df81f5c..fa20a2e2bf2 100644
--- a/tensorflow/compiler/xla/legacy_flags/BUILD
+++ b/tensorflow/compiler/xla/legacy_flags/BUILD
@@ -29,7 +29,6 @@ cc_library(
 
 cc_test(
     name = "parse_flags_from_env_test",
-    size = "small",
     srcs = ["parse_flags_from_env_test.cc"],
     deps =
         [
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index d68883169a9..0bcb75c42a2 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -55,7 +55,6 @@ cc_library(
 
 cc_test(
     name = "shape_inference_test",
-    size = "small",
     srcs = ["shape_inference_test.cc"],
     deps = [
         ":shape_inference",
@@ -70,7 +69,6 @@ cc_test(
 
 cc_test(
     name = "hlo_opcode_test",
-    size = "small",
     srcs = ["hlo_opcode_test.cc"],
     deps = [
         ":hlo",
@@ -103,7 +101,6 @@ cc_library(
 
 cc_test(
     name = "hlo_evaluator_test",
-    size = "small",
     srcs = ["hlo_evaluator_test.cc"],
     deps = [
         ":hlo",
@@ -203,7 +200,6 @@ cc_library(
 
 cc_test(
     name = "hlo_matchers_test",
-    size = "small",
     srcs = ["hlo_matchers_test.cc"],
     deps = [
         ":hlo_matchers",
@@ -225,7 +221,6 @@ cc_library(
 
 cc_test(
     name = "hlo_instruction_test",
-    size = "small",
     srcs = ["hlo_instruction_test.cc"],
     deps = [
         ":hlo",
@@ -254,7 +249,6 @@ cc_library(
 
 cc_test(
     name = "call_graph_test",
-    size = "small",
     srcs = ["call_graph_test.cc"],
     deps = [
         ":call_graph",
@@ -322,7 +316,6 @@ cc_test(
 
 cc_test(
     name = "flatten_call_graph_test",
-    size = "small",
     srcs = ["flatten_call_graph_test.cc"],
     deps = [
         ":call_graph",
@@ -364,7 +357,6 @@ cc_library(
 
 cc_test(
     name = "user_computation_test",
-    size = "small",
     srcs = ["user_computation_test.cc"],
     deps = [
         ":hlo_matchers",
@@ -730,7 +722,6 @@ cc_library(
 
 cc_test(
     name = "liveness_util_test",
-    size = "small",
     srcs = ["liveness_util_test.cc"],
     deps = [
         ":hlo",
@@ -766,7 +757,6 @@ cc_library(
 
 cc_test(
     name = "buffer_liveness_test",
-    size = "small",
     srcs = ["buffer_liveness_test.cc"],
     deps = [
         ":buffer_liveness",
@@ -809,7 +799,6 @@ cc_library(
 
 cc_test(
     name = "buffer_assignment_test",
-    size = "small",
     srcs = ["buffer_assignment_test.cc"],
     deps = [
         ":buffer_assignment",
@@ -888,7 +877,6 @@ cc_library(
 
 cc_test(
     name = "heap_simulator_test",
-    size = "small",
     srcs = ["heap_simulator_test.cc"],
     deps = [
         ":heap_simulator",
@@ -925,7 +913,6 @@ cc_library(
 
 cc_test(
     name = "hlo_scheduling_test",
-    size = "small",
     srcs = ["hlo_scheduling_test.cc"],
     deps = [
         ":hlo",
@@ -964,7 +951,6 @@ cc_library(
 
 cc_test(
     name = "instruction_fusion_test",
-    size = "small",
     srcs = ["instruction_fusion_test.cc"],
     deps = [
         ":hlo_matchers",
@@ -1037,7 +1023,6 @@ cc_library(
 
 cc_test(
     name = "algebraic_simplifier_test",
-    size = "small",
     srcs = ["algebraic_simplifier_test.cc"],
     deps = [
         ":algebraic_simplifier",
@@ -1072,7 +1057,6 @@ cc_library(
 
 cc_test(
     name = "reshape_mover_test",
-    size = "small",
     srcs = ["reshape_mover_test.cc"],
     deps = [
         ":hlo",
@@ -1107,7 +1091,6 @@ cc_library(
 
 cc_test(
     name = "inliner_test",
-    size = "small",
     srcs = ["inliner_test.cc"],
     deps = [
         ":hlo",
@@ -1219,7 +1202,6 @@ cc_library(
 
 cc_test(
     name = "transfer_manager_test",
-    size = "small",
     srcs = ["transfer_manager_test.cc"],
     deps = [
         ":cpu_transfer_manager",
@@ -1253,7 +1235,6 @@ cc_library(
 
 cc_test(
     name = "hlo_cost_analysis_test",
-    size = "small",
     srcs = ["hlo_cost_analysis_test.cc"],
     deps = [
         ":computation_tracker",
@@ -1295,7 +1276,6 @@ cc_library(
 
 cc_test(
     name = "hlo_computation_test",
-    size = "small",
     srcs = ["hlo_computation_test.cc"],
     deps = [
         ":hlo",
@@ -1326,7 +1306,6 @@ cc_binary(
 
 cc_test(
     name = "hlo_module_test",
-    size = "small",
     srcs = ["hlo_module_test.cc"],
     deps = [
         ":hlo",
@@ -1394,7 +1373,6 @@ cc_library(
 
 cc_test(
     name = "hlo_dataflow_analysis_test",
-    size = "small",
     srcs = ["hlo_dataflow_analysis_test.cc"],
     deps = [
         ":hlo",
@@ -1506,7 +1484,6 @@ cc_library(
 
 cc_test(
     name = "tuple_points_to_analysis_test",
-    size = "small",
     srcs = ["tuple_points_to_analysis_test.cc"],
     deps = [
         ":hlo",
@@ -1586,7 +1563,6 @@ cc_library(
 
 cc_test(
     name = "copy_insertion_test",
-    size = "small",
     srcs = ["copy_insertion_test.cc"],
     deps = [
         ":copy_insertion",
@@ -1657,7 +1633,6 @@ cc_library(
 
 cc_test(
     name = "hlo_rematerialization_test",
-    size = "small",
     srcs = ["hlo_rematerialization_test.cc"],
     deps = [
         ":hlo",
@@ -1674,7 +1649,6 @@ cc_test(
 
 cc_test(
     name = "hlo_dce_test",
-    size = "small",
     srcs = ["hlo_dce_test.cc"],
     deps = [
         ":hlo",
@@ -1695,7 +1669,6 @@ cc_test(
 
 cc_test(
     name = "layout_assignment_test",
-    size = "small",
     srcs = ["layout_assignment_test.cc"],
     deps = [
         ":algebraic_simplifier",
@@ -1769,7 +1742,6 @@ cc_library(
 
 cc_test(
     name = "hlo_cse_test",
-    size = "small",
     srcs = ["hlo_cse_test.cc"],
     deps = [
         ":hlo",
@@ -1806,7 +1778,6 @@ cc_library(
 
 cc_test(
     name = "hlo_constant_folding_test",
-    size = "small",
     srcs = ["hlo_constant_folding_test.cc"],
     deps = [
         ":hlo",
@@ -1899,7 +1870,6 @@ cc_library(
 
 cc_test(
     name = "hlo_subcomputation_unification_test",
-    size = "small",
     srcs = ["hlo_subcomputation_unification_test.cc"],
     deps = [
         ":hlo",
@@ -1929,7 +1899,6 @@ cc_library(
 
 cc_test(
     name = "hlo_tfgraph_builder_test",
-    size = "small",
     srcs = ["hlo_tfgraph_builder_test.cc"],
     deps = [
         ":hlo_tfgraph_builder",
@@ -1978,7 +1947,6 @@ cc_library(
 
 cc_test(
     name = "transpose_folding_test",
-    size = "small",
     srcs = ["transpose_folding_test.cc"],
     deps = [
         ":hlo",
@@ -2008,7 +1976,6 @@ cc_library(
 
 cc_test(
     name = "pool_test",
-    size = "small",
     srcs = ["pool_test.cc"],
     deps = [
         ":pool",
diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD
index b24e55980b5..9073738ef12 100644
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@@ -471,7 +471,6 @@ cc_test(
 
 cc_test(
     name = "cpu_instruction_fusion_test",
-    size = "small",
     srcs = ["cpu_instruction_fusion_test.cc"],
     deps = [
         ":cpu_instruction_fusion",
@@ -582,7 +581,6 @@ cc_library(
 
 cc_test(
     name = "conv_canonicalization_test",
-    size = "small",
     srcs = ["conv_canonicalization_test.cc"],
     deps = [
         ":conv_canonicalization",
diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD
index 4e9166b7708..88d2777cabd 100644
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@@ -76,7 +76,6 @@ cc_library(
 
 cc_test(
     name = "stream_assignment_test",
-    size = "small",
     srcs = [
         "stream_assignment_test.cc",
     ],
@@ -305,7 +304,6 @@ cc_library(
 
 cc_test(
     name = "convolution_folding_test",
-    size = "small",
     srcs = ["convolution_folding_test.cc"],
     deps = [
         ":convolution_folding",
@@ -332,7 +330,6 @@ cc_library(
 
 cc_test(
     name = "instruction_fusion_test",
-    size = "small",
     srcs = ["instruction_fusion_test.cc"],
     deps = [
         ":instruction_fusion",
@@ -373,7 +370,6 @@ cc_library(
 
 cc_test(
     name = "fusion_merger_test",
-    size = "small",
     srcs = ["fusion_merger_test.cc"],
     deps = [
         ":fusion_merger",
@@ -482,7 +478,6 @@ cc_library(
 
 cc_test(
     name = "layout_assignment_test",
-    size = "small",
     srcs = ["layout_assignment_test.cc"],
     deps = [
         ":layout_assignment",
@@ -514,7 +509,6 @@ cc_library(
 
 cc_test(
     name = "hlo_schedule_test",
-    size = "small",
     srcs = [
         "hlo_schedule_test.cc",
     ],
@@ -546,7 +540,6 @@ cc_library(
 
 cc_test(
     name = "while_transformer_test",
-    size = "small",
     srcs = ["while_transformer_test.cc"],
     deps = [
         ":instruction_fusion",
diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD
index dec602d7336..cdb62239603 100644
--- a/tensorflow/contrib/batching/BUILD
+++ b/tensorflow/contrib/batching/BUILD
@@ -24,7 +24,6 @@ cc_library(
 
 cc_test(
     name = "batch_scheduler_test",
-    size = "small",
     srcs = ["batch_scheduler_test.cc"],
     deps = [
         ":batch_scheduler",
@@ -57,7 +56,6 @@ cc_library(
 
 cc_test(
     name = "shared_batch_scheduler_test",
-    size = "small",
     srcs = ["shared_batch_scheduler_test.cc"],
     deps = [
         ":shared_batch_scheduler",
@@ -79,7 +77,6 @@ cc_library(
 
 cc_test(
     name = "basic_batch_scheduler_test",
-    size = "small",
     srcs = ["basic_batch_scheduler_test.cc"],
     deps = [
         ":basic_batch_scheduler",
diff --git a/tensorflow/contrib/batching/util/BUILD b/tensorflow/contrib/batching/util/BUILD
index 12666504eb6..42ea0640a27 100644
--- a/tensorflow/contrib/batching/util/BUILD
+++ b/tensorflow/contrib/batching/util/BUILD
@@ -40,7 +40,6 @@ cc_library(
 
 cc_test(
     name = "periodic_function_test",
-    size = "small",
     srcs = ["periodic_function_test.cc"],
     deps = [
         ":periodic_function_dynamic",
diff --git a/tensorflow/contrib/cluster_resolver/BUILD b/tensorflow/contrib/cluster_resolver/BUILD
index 48ddbe7dfa7..9501c332454 100644
--- a/tensorflow/contrib/cluster_resolver/BUILD
+++ b/tensorflow/contrib/cluster_resolver/BUILD
@@ -72,7 +72,6 @@ py_library(
 
 tf_py_test(
     name = "cluster_resolver_py_test",
-    size = "small",
     srcs = ["python/training/cluster_resolver_test.py"],
     additional_deps = [
         ":cluster_resolver_py",
diff --git a/tensorflow/contrib/copy_graph/BUILD b/tensorflow/contrib/copy_graph/BUILD
index 8ad1f23cfab..8ec706df74e 100644
--- a/tensorflow/contrib/copy_graph/BUILD
+++ b/tensorflow/contrib/copy_graph/BUILD
@@ -27,7 +27,6 @@ py_library(
 
 py_test(
     name = "copy_test",
-    size = "small",
     srcs = glob(["python/util/copy_test.py"]),
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/deprecated/BUILD b/tensorflow/contrib/deprecated/BUILD
index f48c6341e3d..3dfbbf55273 100644
--- a/tensorflow/contrib/deprecated/BUILD
+++ b/tensorflow/contrib/deprecated/BUILD
@@ -21,7 +21,6 @@ py_library(
 
 py_test(
     name = "summaries_test",
-    size = "small",
     srcs = ["summaries_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/factorization/kernels/BUILD b/tensorflow/contrib/factorization/kernels/BUILD
index 50deb08616a..9a6d3c6f538 100644
--- a/tensorflow/contrib/factorization/kernels/BUILD
+++ b/tensorflow/contrib/factorization/kernels/BUILD
@@ -52,7 +52,6 @@ cc_library(
 
 cc_test(
     name = "clustering_ops_test",
-    size = "small",
     srcs = ["clustering_ops_test.cc"],
     deps = [
         ":clustering_ops",
diff --git a/tensorflow/contrib/ffmpeg/BUILD b/tensorflow/contrib/ffmpeg/BUILD
index 15224fbbcba..e205d92fbe2 100644
--- a/tensorflow/contrib/ffmpeg/BUILD
+++ b/tensorflow/contrib/ffmpeg/BUILD
@@ -83,7 +83,6 @@ tf_gen_op_wrapper_py(
 
 tf_py_test(
     name = "decode_audio_op_test",
-    size = "small",
     srcs = ["decode_audio_op_test.py"],
     additional_deps = [
         ":ffmpeg_ops_py",
@@ -100,7 +99,6 @@ tf_py_test(
 
 tf_py_test(
     name = "encode_audio_op_test",
-    size = "small",
     srcs = ["encode_audio_op_test.py"],
     additional_deps = [
         ":ffmpeg_ops_py",
diff --git a/tensorflow/contrib/framework/BUILD b/tensorflow/contrib/framework/BUILD
index 3333de6efab..6b0599ddd2d 100644
--- a/tensorflow/contrib/framework/BUILD
+++ b/tensorflow/contrib/framework/BUILD
@@ -180,7 +180,6 @@ py_test(
 
 py_test(
     name = "experimental_test",
-    size = "small",
     srcs = ["python/framework/experimental_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -192,7 +191,6 @@ py_test(
 
 py_test(
     name = "tensor_util_test",
-    size = "small",
     srcs = ["python/framework/tensor_util_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/graph_editor/BUILD b/tensorflow/contrib/graph_editor/BUILD
index c6023c25b1f..b4c53d3da65 100644
--- a/tensorflow/contrib/graph_editor/BUILD
+++ b/tensorflow/contrib/graph_editor/BUILD
@@ -64,7 +64,6 @@ py_library(
 
 py_test(
     name = "util_test",
-    size = "small",
     srcs = ["tests/util_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -77,7 +76,6 @@ py_test(
 
 py_test(
     name = "select_test",
-    size = "small",
     srcs = ["tests/select_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -90,7 +88,6 @@ py_test(
 
 py_test(
     name = "match_test",
-    size = "small",
     srcs = ["tests/match_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -103,7 +100,6 @@ py_test(
 
 py_test(
     name = "subgraph_test",
-    size = "small",
     srcs = ["tests/subgraph_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -116,7 +112,6 @@ py_test(
 
 py_test(
     name = "reroute_test",
-    size = "small",
     srcs = ["tests/reroute_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -130,7 +125,6 @@ py_test(
 
 py_test(
     name = "edit_test",
-    size = "small",
     srcs = ["tests/edit_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -144,7 +138,6 @@ py_test(
 
 py_test(
     name = "transform_test",
-    size = "small",
     srcs = ["tests/transform_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index c96e42de457..2a322b73c63 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -178,7 +178,6 @@ py_test(
 
 py_test(
     name = "optimizers_test",
-    size = "small",
     srcs = ["python/layers/optimizers_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index d35b5556fc8..79a428303cc 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -252,7 +252,6 @@ py_test(
 
 py_test(
     name = "tensor_signature_test",
-    size = "small",
     srcs = ["python/learn/estimators/tensor_signature_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/metrics/BUILD b/tensorflow/contrib/metrics/BUILD
index c17bf60606a..e11dff08f85 100644
--- a/tensorflow/contrib/metrics/BUILD
+++ b/tensorflow/contrib/metrics/BUILD
@@ -47,7 +47,6 @@ py_library(
 
 py_test(
     name = "classification_test",
-    size = "small",
     srcs = ["python/metrics/classification_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/ndlstm/BUILD b/tensorflow/contrib/ndlstm/BUILD
index ba23c70dc0a..8403f841884 100644
--- a/tensorflow/contrib/ndlstm/BUILD
+++ b/tensorflow/contrib/ndlstm/BUILD
@@ -55,7 +55,6 @@ tf_py_test(
 
 tf_py_test(
     name = "lstm2d_test",
-    size = "small",
     srcs = ["python/lstm2d_test.py"],
     additional_deps = [
         ":ndlstm",
@@ -69,7 +68,6 @@ tf_py_test(
 
 tf_py_test(
     name = "misc_test",
-    size = "small",
     srcs = ["python/misc_test.py"],
     additional_deps = [
         ":ndlstm",
diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index f289eee6b07..b5a67206f34 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -44,7 +44,6 @@ py_library(
 
 py_test(
     name = "external_optimizer_test",
-    size = "small",
     srcs = ["python/training/external_optimizer_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -62,7 +61,6 @@ py_test(
 
 py_test(
     name = "moving_average_optimizer_test",
-    size = "small",
     srcs = ["python/training/moving_average_optimizer_test.py"],
     srcs_version = "PY2AND3",
     tags = [
@@ -99,7 +97,6 @@ py_test(
 
 py_test(
     name = "lazy_adam_optimizer_test",
-    size = "small",
     srcs = ["python/training/lazy_adam_optimizer_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -117,7 +114,6 @@ py_test(
 
 py_test(
     name = "nadam_optimizer_test",
-    size = "small",
     srcs = ["python/training/nadam_optimizer_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -137,7 +133,6 @@ py_test(
 
 tf_py_test(
     name = "drop_stale_gradient_optimizer_test",
-    size = "small",
     srcs = ["python/training/drop_stale_gradient_optimizer_test.py"],
     additional_deps = [
         ":opt_py",
diff --git a/tensorflow/contrib/saved_model/cc/saved_model/BUILD b/tensorflow/contrib/saved_model/cc/saved_model/BUILD
index 37c363cd0d2..f3d98cfbbe4 100644
--- a/tensorflow/contrib/saved_model/cc/saved_model/BUILD
+++ b/tensorflow/contrib/saved_model/cc/saved_model/BUILD
@@ -37,7 +37,6 @@ cc_library(
 
 cc_test(
     name = "signature_def_utils_test",
-    size = "small",
     srcs = ["signature_def_utils_test.cc"],
     deps = [
         ":signature_def_utils",
diff --git a/tensorflow/contrib/session_bundle/BUILD b/tensorflow/contrib/session_bundle/BUILD
index ebb7a218562..bcf44154313 100644
--- a/tensorflow/contrib/session_bundle/BUILD
+++ b/tensorflow/contrib/session_bundle/BUILD
@@ -163,7 +163,6 @@ py_library(
 
 py_test(
     name = "gc_test",
-    size = "small",
     srcs = ["gc_test.py"],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:private"],
diff --git a/tensorflow/contrib/slim/BUILD b/tensorflow/contrib/slim/BUILD
index 8f920c9b031..d2664b612cd 100644
--- a/tensorflow/contrib/slim/BUILD
+++ b/tensorflow/contrib/slim/BUILD
@@ -22,7 +22,6 @@ py_library(
 
 py_test(
     name = "evaluation_test",
-    size = "small",
     srcs = ["python/slim/evaluation_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -168,7 +167,6 @@ py_library(
 
 py_test(
     name = "summaries_test",
-    size = "small",
     srcs = ["python/slim/summaries_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/slim/python/slim/data/BUILD b/tensorflow/contrib/slim/python/slim/data/BUILD
index 4d42a11d166..fc71a5fe415 100644
--- a/tensorflow/contrib/slim/python/slim/data/BUILD
+++ b/tensorflow/contrib/slim/python/slim/data/BUILD
@@ -59,7 +59,6 @@ py_library(
 
 py_test(
     name = "dataset_data_provider_test",
-    size = "small",
     srcs = ["dataset_data_provider_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/contrib/specs/BUILD b/tensorflow/contrib/specs/BUILD
index 808709f83f0..6102fac7bde 100644
--- a/tensorflow/contrib/specs/BUILD
+++ b/tensorflow/contrib/specs/BUILD
@@ -51,7 +51,6 @@ tf_py_test(
 
 tf_py_test(
     name = "summaries_test",
-    size = "small",
     srcs = ["python/summaries_test.py"],
     additional_deps = [
         ":specs",
diff --git a/tensorflow/contrib/xla_tf_graph/BUILD b/tensorflow/contrib/xla_tf_graph/BUILD
index fa917ea849a..523f7302b10 100644
--- a/tensorflow/contrib/xla_tf_graph/BUILD
+++ b/tensorflow/contrib/xla_tf_graph/BUILD
@@ -41,7 +41,6 @@ cc_library(
 
 cc_test(
     name = "xla_tf_graph_util_test",
-    size = "small",
     srcs = ["xla_tf_graph_util_test.cc"],
     linkstatic = 1,
     tags = ["nomac"],  # b/63908145
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index c4ae5b79e4c..dd808d1044b 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -38,7 +38,6 @@ cc_library(
 
 cc_test(
     name = "utils_test",
-    size = "small",
     srcs = ["utils_test.cc"],
     deps = [
         ":utils",
@@ -100,7 +99,6 @@ cc_library(
 
 cc_test(
     name = "grappler_item_test",
-    size = "small",
     srcs = ["grappler_item_test.cc"],
     deps = [
         ":grappler_item",
@@ -113,7 +111,6 @@ cc_test(
 
 cc_test(
     name = "grappler_item_builder_test",
-    size = "small",
     srcs = ["grappler_item_builder_test.cc"],
     deps = [
         ":grappler_item_builder",
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 3a029e2d940..9edc0178db9 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -56,7 +56,6 @@ cc_library(
 
 cc_test(
     name = "graph_properties_test",
-    size = "small",
     srcs = ["graph_properties_test.cc"],
     args = ["--heap_check=local"],  # The GPU tracer leaks memory
     data = [":graph_properties_testdata"],
@@ -94,7 +93,6 @@ cc_library(
 
 cc_test(
     name = "graph_memory_test",
-    size = "small",
     srcs = ["graph_memory_test.cc"],
     args = ["--heap_check=local"],  # The GPU tracer leaks memory
     deps = [
@@ -115,7 +113,6 @@ cc_library(
 
 cc_test(
     name = "robust_stats_test",
-    size = "small",
     srcs = ["robust_stats_test.cc"],
     deps = [
         ":robust_stats",
@@ -185,7 +182,6 @@ cc_library(
 
 cc_test(
     name = "virtual_placer_test",
-    size = "small",
     srcs = ["virtual_placer_test.cc"],
     deps = [
         ":virtual_placer",
@@ -220,7 +216,6 @@ cc_library(
 
 cc_test(
     name = "virtual_scheduler_test",
-    size = "small",
     srcs = ["virtual_scheduler_test.cc"],
     deps = [
         ":virtual_placer",
@@ -271,7 +266,6 @@ cc_library(
 
 cc_test(
     name = "op_level_cost_estimator_test",
-    size = "small",
     srcs = ["op_level_cost_estimator_test.cc"],
     deps = [
         ":op_level_cost_estimator",
@@ -304,7 +298,6 @@ cc_library(
 
 cc_test(
     name = "analytical_cost_estimator_test",
-    size = "small",
     srcs = ["analytical_cost_estimator_test.cc"],
     deps = [
         ":analytical_cost_estimator",
diff --git a/tensorflow/core/grappler/inputs/BUILD b/tensorflow/core/grappler/inputs/BUILD
index 915a3e28f88..9f25b99a2d0 100644
--- a/tensorflow/core/grappler/inputs/BUILD
+++ b/tensorflow/core/grappler/inputs/BUILD
@@ -29,7 +29,6 @@ cc_library(
 
 cc_test(
     name = "utils_test",
-    size = "small",
     srcs = [
         "utils_test.cc",
     ],
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index c16ca0d9c4c..97a676e2594 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -35,7 +35,6 @@ cc_library(
 
 cc_test(
     name = "static_schedule_test",
-    size = "small",
     srcs = ["static_schedule_test.cc"],
     deps = [
         ":static_schedule",
@@ -71,7 +70,6 @@ cc_library(
 
 cc_test(
     name = "auto_parallel_test",
-    size = "small",
     srcs = ["auto_parallel_test.cc"],
     deps = [
         ":auto_parallel",
@@ -107,7 +105,6 @@ cc_library(
 
 cc_test(
     name = "constant_folding_test",
-    size = "small",
     srcs = ["constant_folding_test.cc"],
     shard_count = 5,
     deps = [
@@ -207,7 +204,6 @@ cc_library(
 
 cc_test(
     name = "model_pruner_test",
-    size = "small",
     srcs = ["model_pruner_test.cc"],
     deps = [
         ":model_pruner",
@@ -243,7 +239,6 @@ cc_library(
 
 cc_test(
     name = "memory_optimizer_test",
-    size = "small",
     srcs = ["memory_optimizer_test.cc"],
     deps = [
         ":memory_optimizer",
@@ -281,7 +276,6 @@ cc_library(
 
 cc_test(
     name = "layout_optimizer_test",
-    size = "small",
     srcs = ["layout_optimizer_test.cc"],
     deps = [
         ":layout_optimizer",
diff --git a/tensorflow/core/grappler/utils/BUILD b/tensorflow/core/grappler/utils/BUILD
index 44816bbfca8..20d6e8572d9 100644
--- a/tensorflow/core/grappler/utils/BUILD
+++ b/tensorflow/core/grappler/utils/BUILD
@@ -29,7 +29,6 @@ cc_library(
 
 cc_test(
     name = "scc_test",
-    size = "small",
     srcs = ["scc_test.cc"],
     data = [
         "//tensorflow/core/grappler/costs:graph_properties_testdata",
@@ -61,7 +60,6 @@ cc_library(
 
 cc_test(
     name = "topological_sort_test",
-    size = "small",
     srcs = ["topological_sort_test.cc"],
     deps = [
         ":topological_sort",
diff --git a/tensorflow/core/util/tensor_bundle/BUILD b/tensorflow/core/util/tensor_bundle/BUILD
index 4421925c9ec..a599ec5eb68 100644
--- a/tensorflow/core/util/tensor_bundle/BUILD
+++ b/tensorflow/core/util/tensor_bundle/BUILD
@@ -62,7 +62,6 @@ cc_library(
 
 cc_test(
     name = "tensor_bundle_test",
-    size = "small",
     srcs = ["tensor_bundle_test.cc"],
     deps = [
         ":tensor_bundle",
diff --git a/tensorflow/examples/benchmark/BUILD b/tensorflow/examples/benchmark/BUILD
index bd07f52bb8f..c4bb0a5bd95 100644
--- a/tensorflow/examples/benchmark/BUILD
+++ b/tensorflow/examples/benchmark/BUILD
@@ -12,7 +12,6 @@ exports_files(["LICENSE"])
 
 py_test(
     name = "sample_benchmark",
-    size = "small",
     srcs = ["sample_benchmark.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index eaee48bae72..b0bf6347af6 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -354,7 +354,6 @@ py_library(
 
 py_test(
     name = "parsing_utils_test",
-    size = "small",
     srcs = ["canned/parsing_utils_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index a32ba2e6753..50bffd1474c 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -221,7 +221,6 @@ py_binary(
 
 py_test(
     name = "print_selective_registration_header_test",
-    size = "small",
     srcs = ["print_selective_registration_header_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -245,7 +244,6 @@ py_binary(
 
 py_test(
     name = "saved_model_cli_test",
-    size = "small",
     srcs = ["saved_model_cli_test.py"],
     data = [
         "//tensorflow/cc/saved_model:saved_model_half_plus_two",
diff --git a/tensorflow/tools/api/tests/BUILD b/tensorflow/tools/api/tests/BUILD
index e9aeeb38558..e99cc0572f8 100644
--- a/tensorflow/tools/api/tests/BUILD
+++ b/tensorflow/tools/api/tests/BUILD
@@ -13,7 +13,6 @@ exports_files([
 
 py_test(
     name = "api_compatibility_test",
-    size = "small",
     srcs = ["api_compatibility_test.py"],
     data = [
         "//tensorflow/tools/api/golden:api_golden",
diff --git a/tensorflow/tools/common/BUILD b/tensorflow/tools/common/BUILD
index 8a8667957ae..316e5469e7a 100644
--- a/tensorflow/tools/common/BUILD
+++ b/tensorflow/tools/common/BUILD
@@ -20,7 +20,6 @@ py_library(
 
 py_test(
     name = "public_api_test",
-    size = "small",
     srcs = ["public_api_test.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -38,7 +37,6 @@ py_library(
 
 py_test(
     name = "traverse_test",
-    size = "small",
     srcs = ["traverse_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/tools/compatibility/BUILD b/tensorflow/tools/compatibility/BUILD
index 19959ea6d26..51e4c6cef38 100644
--- a/tensorflow/tools/compatibility/BUILD
+++ b/tensorflow/tools/compatibility/BUILD
@@ -19,7 +19,6 @@ py_binary(
 
 py_test(
     name = "tf_upgrade_test",
-    size = "small",
     srcs = ["tf_upgrade_test.py"],
     srcs_version = "PY2AND3",
     deps = [
diff --git a/tensorflow/tools/dist_test/scripts/BUILD b/tensorflow/tools/dist_test/scripts/BUILD
index ce2fa5c743e..6df5c6b660b 100644
--- a/tensorflow/tools/dist_test/scripts/BUILD
+++ b/tensorflow/tools/dist_test/scripts/BUILD
@@ -12,7 +12,6 @@ py_library(
 
 py_test(
     name = "k8s_tensorflow_test",
-    size = "small",
     srcs = ["k8s_tensorflow_test.py"],
     srcs_version = "PY2AND3",
     deps = [