diff --git a/tensorflow/examples/tutorials/mnist/BUILD b/tensorflow/examples/tutorials/mnist/BUILD
index 5d9362081b4..0473de11c76 100644
--- a/tensorflow/examples/tutorials/mnist/BUILD
+++ b/tensorflow/examples/tutorials/mnist/BUILD
@@ -1,7 +1,7 @@
 # Description:
 # Example TensorFlow models for MNIST used in tutorials
 
-load("//tensorflow:tensorflow.bzl", "py_test")
+load("//tensorflow:tensorflow.bzl", "tf_py_test")
 
 package(
     licenses = ["notice"],  # Apache 2.0
@@ -94,43 +94,38 @@ py_binary(
     ],
 )
 
-py_test(
+tf_py_test(
     name = "fully_connected_feed_test",
-    size = "medium",
     srcs = [
         "fully_connected_feed.py",
     ],
+    additional_deps = [
+        ":input_data",
+        ":mnist",
+        "//tensorflow:tensorflow_py",
+    ],
     args = [
         "--fake_data",
         "--max_steps=10",
     ],
     main = "fully_connected_feed.py",
-    python_version = "PY2",
-    srcs_version = "PY2AND3",
-    deps = [
-        ":input_data",
-        ":mnist",
-        "//tensorflow:tensorflow_py",
-    ],
 )
 
-py_test(
+tf_py_test(
     name = "mnist_with_summaries_test",
     size = "small",
     srcs = [
         "mnist_with_summaries.py",
     ],
+    additional_deps = [
+        ":input_data",
+        "//tensorflow:tensorflow_py",
+    ],
     args = [
         "--fake_data",
         "--max_steps=10",
         "--learning_rate=0.00",
     ],
     main = "mnist_with_summaries.py",
-    python_version = "PY2",
-    srcs_version = "PY2AND3",
     tags = ["notsan"],  # http://b/29184009
-    deps = [
-        ":input_data",
-        "//tensorflow:tensorflow_py",
-    ],
 )