diff --git a/site/en/BUILD b/site/en/BUILD.bazel
similarity index 56%
rename from site/en/BUILD
rename to site/en/BUILD.bazel
index 290036b282278e..96893c5c9b01e6 100644
--- a/site/en/BUILD
+++ b/site/en/BUILD.bazel
@@ -8,8 +8,8 @@ exports_files(
         "versions/_toc.yaml",
     ],
     visibility = [
-        "//scripts/docs:__pkg__",
-        "//src/test/java/com/google/devtools/build/lib/packages:__pkg__",
+        "//third_party/bazel/scripts/docs:__pkg__",
+        "//third_party/bazel/src/test/java/com/google/devtools/build/lib/packages:__pkg__",
     ],
 )
 
@@ -17,8 +17,8 @@ filegroup(
     name = "srcs",
     srcs = glob(["**"]),
     visibility = [
-        "//scripts/docs:__pkg__",
-        "//site:__pkg__",
+        "//third_party/bazel/scripts/docs:__pkg__",
+        "//third_party/bazel/site:__pkg__",
     ],
 )
 
@@ -29,5 +29,5 @@ pkg_tar(
         exclude = ["**/BUILD"],
     ),
     strip_prefix = "/site/en",
-    visibility = ["//scripts/docs:__pkg__"],
+    visibility = ["//third_party/bazel/scripts/docs:__pkg__"],
 )
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
index 2236c2934caf17..ad4e0c299f98da 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
@@ -173,7 +173,7 @@ public void newLocalRepository() throws Exception {
 
   @Test
   public void buildDotBazelForSubpackageCheckDuringGlobbing() throws Exception {
-    file("a/BUILD", "filegroup(name = 'fg', srcs = glob(['sub/a.txt']))");
+    file("a/BUILD", "filegroup(name = 'fg', srcs = glob(['sub/a.txt'], allow_empty = True))");
     file("a/sub/a.txt");
     file("a/sub/BUILD.bazel");