diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 858ebc4358c..2ac394a43d6 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -118,6 +118,7 @@ filegroup(
         "//tensorflow/models/rnn/ptb:all_files",
         "//tensorflow/models/rnn/translate:all_files",
         "//tensorflow/python:all_files",
+        "//tensorflow/python/kernel_tests:all_files",
         "//tensorflow/python/tools:all_files",
         "//tensorflow/tensorboard:all_files",
         "//tensorflow/tensorboard/app:all_files",
diff --git a/tensorflow/g3doc/how_tos/adding_an_op/BUILD b/tensorflow/g3doc/how_tos/adding_an_op/BUILD
index 17b47e4fb43..e415662a03c 100644
--- a/tensorflow/g3doc/how_tos/adding_an_op/BUILD
+++ b/tensorflow/g3doc/how_tos/adding_an_op/BUILD
@@ -82,7 +82,6 @@ py_test(
         ":zero_out_grad_2",
         ":zero_out_op_2",
         "//tensorflow:tensorflow_py",
-        "//tensorflow/python:kernel_tests/gradient_checker",
     ],
 )
 
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 41c5ff87197..ebcf0c9f0a4 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -29,12 +29,12 @@ py_library(
         ":client_testlib",
         ":framework",
         ":framework_test_lib",
-        ":kernel_tests/gradient_checker",
         ":platform",
         ":platform_test",
         ":summary",
         ":training",
         "//tensorflow/contrib:contrib_py",
+        "//tensorflow/python/kernel_tests:gradient_checker",
     ],
 )
 
@@ -1100,99 +1100,6 @@ py_test(
     ],
 )
 
-py_library(
-    name = "kernel_tests/gradient_checker",
-    srcs = ["kernel_tests/gradient_checker.py"],
-    srcs_version = "PY2AND3",
-)
-
-medium_kernel_test_list = glob([
-    "kernel_tests/concat_op_test.py",
-    "kernel_tests/division_future_test.py",
-    "kernel_tests/fft_ops_test.py",
-    "kernel_tests/pooling_ops_test.py",
-    "kernel_tests/rnn_test.py",
-    "kernel_tests/random_gamma_test.py",
-    "kernel_tests/scatter_ops_test.py",
-    "kernel_tests/seq2seq_test.py",
-    "kernel_tests/slice_op_test.py",
-    "kernel_tests/sparse_ops_test.py",
-    "kernel_tests/sparse_matmul_op_test.py",
-    "kernel_tests/sparse_tensor_dense_matmul_op_test.py",
-])
-
-sharded_kernel_test_list = glob([
-    "kernel_tests/batch_matrix_band_part_op_test.py",
-    "kernel_tests/cwise_ops_test.py",
-    "kernel_tests/embedding_ops_test.py",
-    "kernel_tests/linalg_grad_test.py",
-    "kernel_tests/conv_ops_3d_test.py",
-])
-
-cpu_only_kernel_test_list = glob([
-    "kernel_tests/attention_ops_test.py",
-    "kernel_tests/barrier_ops_test.py",
-    "kernel_tests/bcast_ops_test.py",
-    "kernel_tests/benchmark_test.py",
-    "kernel_tests/candidate_sampler_ops_test.py",
-    "kernel_tests/cholesky_op_test.py",
-    "kernel_tests/clip_ops_test.py",
-    "kernel_tests/decode_csv_op_test.py",
-    "kernel_tests/decode_raw_op_test.py",
-    "kernel_tests/determinant_op_test.py",
-    "kernel_tests/diag_op_test.py",
-    "kernel_tests/edit_distance_op_test.py",
-    "kernel_tests/fifo_queue_test.py",
-    "kernel_tests/identity_op_py_test.py",
-    "kernel_tests/in_topk_op_test.py",
-    "kernel_tests/io_ops_test.py",
-    "kernel_tests/listdiff_op_test.py",
-    "kernel_tests/logging_ops_test.py",
-    "kernel_tests/lookup_table_op_test.py",
-    "kernel_tests/lrn_op_py_test.py",
-    "kernel_tests/matrix_inverse_op_test.py",
-    "kernel_tests/matrix_solve_op_test.py",
-    "kernel_tests/matrix_triangular_solve_op_test.py",
-    "kernel_tests/matrix_solve_ls_op_test.py",
-    "kernel_tests/mutex_ops_test.py",
-    "kernel_tests/parsing_ops_test.py",
-    "kernel_tests/partitioned_variables_test.py",
-    "kernel_tests/queue_ops_test.py",
-    "kernel_tests/random_shuffle_queue_test.py",
-    "kernel_tests/save_restore_ops_test.py",
-    "kernel_tests/segment_reduction_ops_test.py",
-    "kernel_tests/self_adjoint_eig_op_test.py",
-    "kernel_tests/sparse_add_op_test.py",
-    "kernel_tests/sparse_concat_op_test.py",
-    "kernel_tests/sparse_split_op_test.py",
-    "kernel_tests/sparse_reorder_op_test.py",
-    "kernel_tests/sparse_reshape_op_test.py",
-    "kernel_tests/sparse_to_dense_op_test.py",
-    "kernel_tests/sparsemask_op_test.py",
-    "kernel_tests/summary_ops_test.py",
-    "kernel_tests/template_test.py",
-    "kernel_tests/topk_op_test.py",
-    "kernel_tests/unique_op_test.py",
-    "kernel_tests/variable_scope_test.py",
-    "kernel_tests/variables_test.py",
-    "kernel_tests/where_op_test.py",
-])
-
-py_tests(
-    name = "cpu_only_kernel_tests",
-    size = "small",
-    srcs = cpu_only_kernel_test_list,
-)
-
-py_tests(
-    name = "reader_ops_test",
-    size = "small",
-    srcs = ["kernel_tests/reader_ops_test.py"],
-    additional_deps = [
-        ":lib",
-    ],
-)
-
 cuda_py_tests(
     name = "op_tests",
     size = "small",
@@ -1220,30 +1127,6 @@ cuda_py_tests(
     ],
 )
 
-cuda_py_tests(
-    name = "kernel_tests",
-    size = "small",
-    srcs = glob(
-        ["kernel_tests/*_test.py"],
-        exclude = [
-            "**/reader_ops_test.py",
-        ] + cpu_only_kernel_test_list + medium_kernel_test_list + sharded_kernel_test_list,
-    ),
-)
-
-cuda_py_tests(
-    name = "medium_kernel_tests",
-    size = "medium",
-    srcs = medium_kernel_test_list,
-)
-
-cuda_py_tests(
-    name = "kernel_tests_with_sharding",
-    size = "medium",
-    srcs = sharded_kernel_test_list,
-    shard_count = 50,
-)
-
 cuda_py_tests(
     name = "image_ops_test",
     size = "small",
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
new file mode 100644
index 00000000000..2eccd5a462f
--- /dev/null
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -0,0 +1,143 @@
+# Tests of TensorFlow kernels written using the Python API.
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load("//tensorflow:tensorflow.bzl", "py_tests")
+load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
+
+py_library(
+    name = "gradient_checker",
+    srcs = ["gradient_checker.py"],
+    srcs_version = "PY2AND3",
+)
+
+medium_kernel_test_list = glob([
+    "concat_op_test.py",
+    "division_future_test.py",
+    "fft_ops_test.py",
+    "pooling_ops_test.py",
+    "rnn_test.py",
+    "random_gamma_test.py",
+    "scatter_ops_test.py",
+    "seq2seq_test.py",
+    "slice_op_test.py",
+    "sparse_ops_test.py",
+    "sparse_matmul_op_test.py",
+    "sparse_tensor_dense_matmul_op_test.py",
+])
+
+sharded_kernel_test_list = glob([
+    "batch_matrix_band_part_op_test.py",
+    "cwise_ops_test.py",
+    "embedding_ops_test.py",
+    "linalg_grad_test.py",
+    "conv_ops_3d_test.py",
+])
+
+cpu_only_kernel_test_list = glob([
+    "attention_ops_test.py",
+    "barrier_ops_test.py",
+    "bcast_ops_test.py",
+    "benchmark_test.py",
+    "candidate_sampler_ops_test.py",
+    "cholesky_op_test.py",
+    "clip_ops_test.py",
+    "decode_csv_op_test.py",
+    "decode_raw_op_test.py",
+    "determinant_op_test.py",
+    "diag_op_test.py",
+    "edit_distance_op_test.py",
+    "fifo_queue_test.py",
+    "identity_op_py_test.py",
+    "in_topk_op_test.py",
+    "io_ops_test.py",
+    "listdiff_op_test.py",
+    "logging_ops_test.py",
+    "lookup_table_op_test.py",
+    "lrn_op_py_test.py",
+    "matrix_inverse_op_test.py",
+    "matrix_solve_op_test.py",
+    "matrix_triangular_solve_op_test.py",
+    "matrix_solve_ls_op_test.py",
+    "mutex_ops_test.py",
+    "parsing_ops_test.py",
+    "partitioned_variables_test.py",
+    "queue_ops_test.py",
+    "random_shuffle_queue_test.py",
+    "save_restore_ops_test.py",
+    "segment_reduction_ops_test.py",
+    "self_adjoint_eig_op_test.py",
+    "sparse_add_op_test.py",
+    "sparse_concat_op_test.py",
+    "sparse_split_op_test.py",
+    "sparse_reorder_op_test.py",
+    "sparse_reshape_op_test.py",
+    "sparse_to_dense_op_test.py",
+    "sparsemask_op_test.py",
+    "summary_ops_test.py",
+    "template_test.py",
+    "topk_op_test.py",
+    "unique_op_test.py",
+    "variable_scope_test.py",
+    "variables_test.py",
+    "where_op_test.py",
+])
+
+py_tests(
+    name = "cpu_only_kernel_tests",
+    size = "small",
+    srcs = cpu_only_kernel_test_list,
+)
+
+py_tests(
+    name = "reader_ops_test",
+    size = "small",
+    srcs = ["reader_ops_test.py"],
+    additional_deps = [
+        "//tensorflow/python:lib",
+    ],
+)
+
+cuda_py_tests(
+    name = "kernel_tests",
+    size = "small",
+    srcs = glob(
+        ["*_test.py"],
+        exclude = [
+            "reader_ops_test.py",
+        ] + cpu_only_kernel_test_list + medium_kernel_test_list + sharded_kernel_test_list,
+    ),
+)
+
+cuda_py_tests(
+    name = "medium_kernel_tests",
+    size = "medium",
+    srcs = medium_kernel_test_list,
+)
+
+cuda_py_tests(
+    name = "kernel_tests_with_sharding",
+    size = "medium",
+    srcs = sharded_kernel_test_list,
+    shard_count = 50,
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 75e6a94086d..a4dad615c3a 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -689,7 +689,7 @@ def tf_py_test(name, srcs, size="medium", data=[], main=None, args=[],
       data=data,
       deps=[
           "//tensorflow/python:extra_py_tests_deps",
-          "//tensorflow/python:kernel_tests/gradient_checker",
+          "//tensorflow/python/kernel_tests:gradient_checker",
       ] + additional_deps,
       srcs_version="PY2AND3")
 
diff --git a/tensorflow/tools/test/BUILD b/tensorflow/tools/test/BUILD
index bdf4037ca92..b4dc3c71337 100644
--- a/tensorflow/tools/test/BUILD
+++ b/tensorflow/tools/test/BUILD
@@ -80,7 +80,7 @@ tf_cc_logged_benchmark(
 
 tf_py_logged_benchmark(
     name = "rnn_op_benchmark",
-    target = "//tensorflow/python:rnn_test",
+    target = "//tensorflow/python/kernel_tests:rnn_test",
 )
 
 filegroup(