diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 874482d3339..efad3df7c1a 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -790,6 +790,7 @@ tf_py_test(
     name = "parsing_ops_test",
     size = "medium",
     srcs = ["parsing_ops_test.py"],
+    tags = ["no_mac"],
     deps = [
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
@@ -801,7 +802,6 @@ tf_py_test(
         "//tensorflow/python:platform",
         "//third_party/py/numpy",
     ],
-    tags = ["no_mac"],
 )
 
 tf_py_test(
diff --git a/tensorflow/python/kernel_tests/boosted_trees/BUILD b/tensorflow/python/kernel_tests/boosted_trees/BUILD
index cbb60de7b9c..68b27849773 100644
--- a/tensorflow/python/kernel_tests/boosted_trees/BUILD
+++ b/tensorflow/python/kernel_tests/boosted_trees/BUILD
@@ -24,6 +24,7 @@ tf_py_test(
     name = "resource_ops_test",
     size = "small",
     srcs = ["resource_ops_test.py"],
+    tags = ["no_mac"],
     deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:boosted_trees_ops",
@@ -33,13 +34,13 @@ tf_py_test(
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
     ],
-    tags = ["no_mac"],
 )
 
 tf_py_test(
     name = "prediction_ops_test",
     size = "small",
     srcs = ["prediction_ops_test.py"],
+    tags = ["no_mac"],
     deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:array_ops",
@@ -48,7 +49,6 @@ tf_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:resources",
     ],
-    tags = ["no_mac"],
 )
 
 tf_py_test(
@@ -71,6 +71,7 @@ tf_py_test(
     name = "training_ops_test",
     size = "small",
     srcs = ["training_ops_test.py"],
+    tags = ["no_mac"],
     deps = [
         "//tensorflow/core/kernels/boosted_trees:boosted_trees_proto_py",
         "//tensorflow/python:array_ops",
@@ -79,7 +80,6 @@ tf_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:resources",
     ],
-    tags = ["no_mac"],
 )
 
 tf_py_test(