diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index abde74840b4..702a084a693 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2045,7 +2045,6 @@ cuda_py_test(
         "//tensorflow/python:gradients",
         "//tensorflow/python:variables",
     ],
-    xla_enable_strict_auto_jit = True,
 )
 
 cuda_py_test(
diff --git a/tensorflow/python/kernel_tests/gather_nd_op_test.py b/tensorflow/python/kernel_tests/gather_nd_op_test.py
index cee2d85804e..cfbdeb50ff4 100644
--- a/tensorflow/python/kernel_tests/gather_nd_op_test.py
+++ b/tensorflow/python/kernel_tests/gather_nd_op_test.py
@@ -206,6 +206,7 @@ class GatherNdTest(test.TestCase):
     self.assertEqual(None, tensor_shape.dimension_value(shape[0]))
 
   @test_util.run_deprecated_v1
+  @test_util.disable_xla("XLA does not have assertions in kernels.")
   def testBadIndicesCPU(self):
     with self.session(use_gpu=False):
       params = [0, 1, 2]
@@ -229,6 +230,7 @@ class GatherNdTest(test.TestCase):
         self.evaluate(gather_nd)
 
   @test_util.run_deprecated_v1
+  @test_util.disable_xla("XLA does not have assertions in kernels.")
   def testBadIndicesWithSlicesCPU(self):
     with self.session(use_gpu=False):
       params = [[0, 1, 2]]