diff --git a/tensorflow/core/lib/psnr/BUILD b/tensorflow/core/lib/psnr/BUILD
index 196047c14c9..a217228dc25 100644
--- a/tensorflow/core/lib/psnr/BUILD
+++ b/tensorflow/core/lib/psnr/BUILD
@@ -1,5 +1,3 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-
 package(
     default_visibility = [
         "//tensorflow/core:__pkg__",
@@ -7,11 +5,7 @@ package(
     licenses = ["notice"],  # Apache 2.0
 )
 
-filegroup(
+alias(
     name = "testdata",
-    srcs = [
-        "testdata/cat_q20.jpg",
-        "testdata/cat_q72.jpg",
-        "testdata/cat_q95.jpg",
-    ],
+    actual = "//tensorflow/core/lib/psnr/testdata:psnr_testdata",
 )
diff --git a/tensorflow/core/lib/psnr/testdata/BUILD b/tensorflow/core/lib/psnr/testdata/BUILD
new file mode 100644
index 00000000000..2a859e305d9
--- /dev/null
+++ b/tensorflow/core/lib/psnr/testdata/BUILD
@@ -0,0 +1,20 @@
+# Description:
+# PSNR test data packages.
+
+load("//tensorflow:tensorflow.bzl", "filegroup")
+
+package(
+    default_visibility = [
+        "//tensorflow/core/lib/psnr:__pkg__",
+    ],
+    licenses = ["notice"],  # Apache 2.0
+)
+
+filegroup(
+    name = "psnr_testdata",
+    srcs = [
+        "cat_q20.jpg",
+        "cat_q72.jpg",
+        "cat_q95.jpg",
+    ],
+)