diff --git a/tensorflow/python/kernel_tests/basic_gpu_test.py b/tensorflow/python/kernel_tests/basic_gpu_test.py
index b4f964d2daa..a64032ec216 100644
--- a/tensorflow/python/kernel_tests/basic_gpu_test.py
+++ b/tensorflow/python/kernel_tests/basic_gpu_test.py
@@ -189,10 +189,13 @@ class BroadcastSimpleTest(test.TestCase):
       return math_ops.truediv(x1, x2) * math_ops.cast(1.1, dtype=x2.dtype)
 
     with self.cached_session():
-      gradient_checker_v2.compute_gradient(
-          div_x1, [x1], self._GRAD_TOL[dtypes.as_dtype(x1.dtype)])
-      gradient_checker_v2.compute_gradient(
-          div_x2, [x2], self._GRAD_TOL[dtypes.as_dtype(x2.dtype)])
+      err = gradient_checker_v2.max_error(*gradient_checker_v2.compute_gradient(
+          div_x1, [x1]))
+      self.assertLess(err, self._GRAD_TOL[dtypes.as_dtype(x1.dtype)])
+
+      err = gradient_checker_v2.max_error(*gradient_checker_v2.compute_gradient(
+          div_x2, [x2]))
+      self.assertLess(err, self._GRAD_TOL[dtypes.as_dtype(x2.dtype)])
 
     self._compareGpu(x1, x2, np.true_divide, math_ops.truediv)
     self._compareGpu(x1, x2 + 0.1, np.floor_divide, math_ops.floordiv)
diff --git a/tensorflow/python/kernel_tests/cast_op_test.py b/tensorflow/python/kernel_tests/cast_op_test.py
index 7f5474ccf19..7b794153ce6 100644
--- a/tensorflow/python/kernel_tests/cast_op_test.py
+++ b/tensorflow/python/kernel_tests/cast_op_test.py
@@ -180,7 +180,9 @@ class CastOpTest(test.TestCase):
             x = math_ops.cast(x, dst_t)
             return x
 
-          gradient_checker_v2.compute_gradient(cast, [x])
+          err = gradient_checker_v2.max_error(
+              *gradient_checker_v2.compute_gradient(cast, [x]))
+          self.assertLess(err, 1e-3)
 
 
 class SparseTensorCastTest(test.TestCase):
diff --git a/tensorflow/python/kernel_tests/reshape_op_test.py b/tensorflow/python/kernel_tests/reshape_op_test.py
index 312d99c7d9b..80f72554aeb 100644
--- a/tensorflow/python/kernel_tests/reshape_op_test.py
+++ b/tensorflow/python/kernel_tests/reshape_op_test.py
@@ -126,7 +126,9 @@ class ReshapeTest(test.TestCase):
       return array_ops.reshape(x, [1, 8, 3])
 
     with self.cached_session():
-      gradient_checker_v2.compute_gradient(reshape, [input_tensor], 1e-3)
+      err = gradient_checker_v2.max_error(
+          *gradient_checker_v2.compute_gradient(reshape, [input_tensor]))
+      self.assertLess(err, 1e-3)
 
   def testFloatEmpty(self):
     x = np.empty((0, 0, 0, 0), dtype=np.float32)