From e377515c09eecda8bfb2e28493330b19dc373714 Mon Sep 17 00:00:00 2001
From: Googler <pcloudy@google.com>
Date: Thu, 8 Aug 2024 04:17:36 -0700
Subject: [PATCH] Make sure external_* tests work with --enable_workspace=false

A part of https://github.com/bazelbuild/bazel/pull/23087

Working towards: https://github.com/bazelbuild/bazel/issues/23023

PiperOrigin-RevId: 660778111
Change-Id: I98469a867733204aa6d2e428d36faba60fa91cb6
---
 .../shell/bazel/external_correctness_test.sh  |  54 +--
 .../shell/bazel/external_integration_test.sh  | 439 ++++++++++--------
 .../shell/bazel/external_patching_test.sh     |  72 ++-
 src/test/shell/bazel/external_path_test.sh    |  53 ++-
 .../shell/bazel/external_remote_file_test.sh  |  66 +--
 .../bazel/external_starlark_execute_test.sh   |  10 +-
 .../bazel/external_starlark_load_test.sh      |  20 +-
 7 files changed, 366 insertions(+), 348 deletions(-)

diff --git a/src/test/shell/bazel/external_correctness_test.sh b/src/test/shell/bazel/external_correctness_test.sh
index b09e052a8d7359..9d612a3d211a1e 100755
--- a/src/test/shell/bazel/external_correctness_test.sh
+++ b/src/test/shell/bazel/external_correctness_test.sh
@@ -25,7 +25,7 @@ function set_up() {
 
   # Set up empty remote repo.
   mkdir -p $REMOTE
-  touch $REMOTE/WORKSPACE
+  touch $REMOTE/REPO.bazel
   cat > $REMOTE/BUILD <<EOF
 genrule(
     name = "get-input",
@@ -37,7 +37,8 @@ genrule(
 EOF
 
   # Set up local repo that uses $REMOTE as an external repo.
-  cat > $LOCAL/WORKSPACE <<EOF
+  cat > $LOCAL/MODULE.bazel <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(
     name = "a",
     path = "$REMOTE",
@@ -142,14 +143,14 @@ genrule(
 )
 EOF
   bazel build @a//b/c:echo-d &> $TEST_log || fail "Build failed"
-  assert_contains "bazel-out/.*-fastbuild/.*/external/a/b/c" \
-    "bazel-genfiles/external/a/b/c/d"
+  assert_contains "bazel-out/.*-fastbuild/.*/external/+_repo_rules+a/b/c" \
+    "bazel-genfiles/external/+_repo_rules+a/b/c/d"
 }
 
 function test_package_group_in_external_repos() {
   REMOTE=$TEST_TMPDIR/r
   mkdir -p $REMOTE/v $REMOTE/a v a
-  touch $REMOTE/WORKSPACE
+  touch $REMOTE/REPO.bazel
 
   echo 'filegroup(name="rv", srcs=["//:fg"])' > $REMOTE/v/BUILD
   echo 'filegroup(name="ra", srcs=["//:fg"])' > $REMOTE/a/BUILD
@@ -160,14 +161,14 @@ package_group(name="pg", packages=["//v"])
 filegroup(name="fg", visibility=[":pg"])
 EOF
 
-  echo "local_repository(name='r', path='$REMOTE')" > WORKSPACE
+  echo "local_repository(name='r', path='$REMOTE')" >> MODULE.bazel
   bazel build @r//v:rv >& $TEST_log || fail "Build failed"
   bazel build @r//a:ra >& $TEST_log && fail "Build succeeded"
-  expect_log "target '@@r//:fg' is not visible"
+  expect_log "target '@@+_repo_rules+r//:fg' is not visible"
   bazel build //a:ma >& $TEST_log && fail "Build succeeded"
-  expect_log "target '@@r//:fg' is not visible"
+  expect_log "target '@@+_repo_rules+r//:fg' is not visible"
   bazel build //v:mv >& $TEST_log && fail "Build succeeded"
-  expect_log "target '@@r//:fg' is not visible"
+  expect_log "target '@@+_repo_rules+r//:fg' is not visible"
 
 }
 
@@ -176,7 +177,7 @@ function test_refs_btwn_repos() {
   REMOTE1=$TEST_TMPDIR/remote1
   REMOTE2=$TEST_TMPDIR/remote2
   mkdir -p $REMOTE1 $REMOTE2
-  touch $REMOTE1/WORKSPACE $REMOTE2/WORKSPACE
+  touch $REMOTE1/REPO.bazel $REMOTE2/REPO.bazel
   cat > $REMOTE1/input <<EOF
 1.0
 EOF
@@ -191,7 +192,7 @@ genrule(
     outs = ["x.out"],
 )
 EOF
-  cat > WORKSPACE <<EOF
+  cat >> MODULE.bazel <<EOF
 local_repository(
     name = "remote1",
     path = "$REMOTE1",
@@ -203,13 +204,13 @@ local_repository(
 EOF
 
   bazel build @remote2//:x &> $TEST_log || fail "Build failed"
-  assert_contains 1.0 bazel-genfiles/external/remote2/x.out
+  assert_contains 1.0 bazel-genfiles/external/+_repo_rules+remote2/x.out
 }
 
 function test_visibility_attributes_in_external_repos() {
   REMOTE=$TEST_TMPDIR/r
   mkdir -p $REMOTE/v $REMOTE/r
-  touch $REMOTE/WORKSPACE
+  touch $REMOTE/REPO.bazel
 
   cat > $REMOTE/r/BUILD <<EOF
 package(default_visibility=["//v:v"])
@@ -225,7 +226,7 @@ EOF
 filegroup(name="fg", srcs=["//r:fg1", "//r:fg2"])
 EOF
 
-  cat > WORKSPACE <<EOF
+  cat >> MODULE.bazel <<EOF
 local_repository(name = "r", path = "$REMOTE")
 EOF
 
@@ -235,14 +236,14 @@ EOF
 
   bazel build @r//:fg || fail "Build failed"
   bazel build //:fg >& $TEST_log && fail "Build succeeded"
-  expect_log "target '@@r//r:fg1' is not visible"
+  expect_log "target '@@+_repo_rules+r//r:fg1' is not visible"
 
 }
 
 function test_select_in_external_repo() {
   REMOTE=$TEST_TMPDIR/r
   mkdir -p $REMOTE/a $REMOTE/c d
-  touch $REMOTE/WORKSPACE
+  touch $REMOTE/REPO.bazel
 
   cat > $REMOTE/a/BUILD <<'EOF'
 genrule(
@@ -265,7 +266,7 @@ package(default_visibility=["//visibility:public"])
 config_setting(name = "one", values = { "define": "ARG=one" })
 EOF
 
-  cat > WORKSPACE <<EOF
+  cat >> MODULE.bazel <<EOF
 local_repository(name="r", path="$REMOTE")
 EOF
 
@@ -280,15 +281,15 @@ config_setting(name = "four", values = { "define": "ARG=four" })
 EOF
 
   bazel build @r//a:gr || fail "build failed"
-  assert_contains "default" bazel-genfiles/external/r/a/gro
+  assert_contains "default" bazel-genfiles/external/+_repo_rules+r/a/gro
   bazel build @r//a:gr --define=ARG=one|| fail "build failed"
-  assert_contains "one" bazel-genfiles/external/r/a/gro
+  assert_contains "one" bazel-genfiles/external/+_repo_rules+r/a/gro
   bazel build @r//a:gr --define=ARG=two || fail "build failed"
-  assert_contains "two" bazel-genfiles/external/r/a/gro
+  assert_contains "two" bazel-genfiles/external/+_repo_rules+r/a/gro
   bazel build @r//a:gr --define=ARG=three || fail "build failed"
-  assert_contains "three" bazel-genfiles/external/r/a/gro
+  assert_contains "three" bazel-genfiles/external/+_repo_rules+r/a/gro
   bazel build @r//a:gr --define=ARG=four || fail "build failed"
-  assert_contains "four" bazel-genfiles/external/r/a/gro
+  assert_contains "four" bazel-genfiles/external/+_repo_rules+r/a/gro
 
 }
 
@@ -297,7 +298,8 @@ function top_level_dir_changes_helper() {
   mkdir -p r/subdir m
   touch r/one r/subdir/two
 
-  cat > m/WORKSPACE <<'EOF'
+  cat > $(setup_module_dot_bazel "m/MODULE.bazel") <<'EOF'
+new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")
 new_local_repository(
     name = "r",
     path = "../r",
@@ -310,18 +312,18 @@ genrule(
 )""",
 )
 EOF
-  write_default_lockfile "m/MODULE.bazel.lock"
+
   cd m
   bazel "$batch_flag" build @r//:fg &> $TEST_log || \
     fail "Expected build to succeed"
   touch ../r/three
   bazel "$batch_flag" build @r//:fg &> $TEST_log || \
     fail "Expected build to succeed"
-  assert_contains "external/r/three" bazel-genfiles/external/r/fg.out
+  assert_contains "external/+_repo_rules+r/three" bazel-genfiles/external/+_repo_rules+r/fg.out
   touch ../r/subdir/four
   bazel "$batch_flag" build @r//:fg &> $TEST_log || \
     fail "Expected build to succeed"
-  assert_contains "external/r/subdir/four" bazel-genfiles/external/r/fg.out
+  assert_contains "external/+_repo_rules+r/subdir/four" bazel-genfiles/external/+_repo_rules+r/fg.out
 }
 
 function test_top_level_dir_changes_batch() {
diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh
index bf14e71adeeabc..a36fc10e29583c 100755
--- a/src/test/shell/bazel/external_integration_test.sh
+++ b/src/test/shell/bazel/external_integration_test.sh
@@ -32,7 +32,7 @@ java_binary(
     name = "ball-pit",
     srcs = ["BallPit.java"],
     main_class = "BallPit",
-    deps = ["//external:mongoose"],
+    deps = ["@endangered//jar"],
 )
 EOF
 
@@ -56,17 +56,17 @@ tear_down() {
 
 function zip_up() {
   repo2_zip=$TEST_TMPDIR/fox.zip
-  zip -0 -ry $repo2_zip WORKSPACE fox
+  zip -0 -ry $repo2_zip MODULE.bazel fox
 }
 
 function tar_gz_up() {
   repo2_zip=$TEST_TMPDIR/fox.tar.gz
-  tar czf $repo2_zip WORKSPACE fox
+  tar czf $repo2_zip MODULE.bazel fox
 }
 
 function tar_xz_up() {
   repo2_zip=$TEST_TMPDIR/fox.tar.xz
-  tar cJf $repo2_zip WORKSPACE fox
+  tar cJf $repo2_zip MODULE.bazel fox
 }
 
 # Test downloading a file from a repository.
@@ -97,7 +97,7 @@ function http_archive_helper() {
     rm -rf $repo2
     mkdir -p $repo2/fox
     cd $repo2
-    create_workspace_with_default_repos WORKSPACE
+    setup_module_dot_bazel
     cat > fox/BUILD <<EOF
 filegroup(
     name = "fox",
@@ -125,7 +125,8 @@ EOF
 
   cd ${WORKSPACE_DIR}
   if [[ $write_workspace = 0 ]]; then
-    cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
+    cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'endangered',
     url = 'http://127.0.0.1:$nc_port/$repo2_name',
@@ -143,7 +144,7 @@ EOF
 
     cat > zoo/female.sh <<EOF
 #!/bin/sh
-../endangered/fox/male
+../+_repo_rules+endangered/fox/male
 EOF
     chmod +x zoo/female.sh
 fi
@@ -153,7 +154,7 @@ fi
   kill_nc
   expect_log $what_does_the_fox_say
 
-  base_external_path=bazel-out/../external/endangered/fox
+  base_external_path=bazel-out/../external/+_repo_rules+endangered/fox
   assert_files_same ${base_external_path}/male ${base_external_path}/male_relative
   assert_files_same ${base_external_path}/male ${base_external_path}/male_absolute
   case "${PLATFORM}" in
@@ -183,8 +184,8 @@ function test_http_archive_zip() {
 
   # Test with the extension
   serve_file $repo2_zip
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'endangered',
     url = 'http://127.0.0.1:$nc_port/bleh',
@@ -209,8 +210,8 @@ function test_http_archive_tar_xz() {
 }
 
 function test_http_archive_tar_zstd() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'test_zstd_repo',
     url = 'file://$(rlocation io_bazel/src/test/shell/bazel/testdata/zstd_test_archive.tar.zst)',
@@ -220,13 +221,13 @@ http_archive(
 EOF
   bazel build @test_zstd_repo//...
 
-  base_external_path=bazel-out/../external/test_zstd_repo
+  base_external_path=bazel-out/../external/+_repo_rules+test_zstd_repo
   assert_contains "test content" "${base_external_path}/test_dir/test_file"
 }
 
 function test_http_archive_upper_case_sha() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'test_zstd_repo',
     url = 'file://$(rlocation io_bazel/src/test/shell/bazel/testdata/zstd_test_archive.tar.zst)',
@@ -236,13 +237,13 @@ http_archive(
 EOF
   bazel build @test_zstd_repo//...
 
-  base_external_path=bazel-out/../external/test_zstd_repo
+  base_external_path=bazel-out/../external/+_repo_rules+test_zstd_repo
   assert_contains "test content" "${base_external_path}/test_dir/test_file"
 }
 
 function test_http_archive_no_server() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(name = 'endangered', url = 'http://bad.example/repo.zip',
     sha256 = '2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9826')
 EOF
@@ -271,15 +272,15 @@ function test_http_archive_mismatched_sha256() {
   rm -rf $repo2
   mkdir -p $repo2
   cd $repo2
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   repo2_zip=$TEST_TMPDIR/fox.zip
-  zip -r $repo2_zip WORKSPACE
+  zip -r $repo2_zip MODULE.bazel
   serve_file $repo2_zip
   wrong_sha256=0000000000000000000000000000000000000000
 
   cd ${WORKSPACE_DIR}
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'endangered',
     url = 'http://127.0.0.1:$nc_port/repo.zip',
@@ -325,7 +326,7 @@ function test_sha256_caching() {
 
 function test_cached_across_server_restart() {
   http_archive_helper zip_up
-  local marker_file=$(bazel info output_base)/external/\@endangered.marker
+  local marker_file=$(bazel info output_base)/external/\@+_repo_rules+endangered.marker
   echo "<MARKER>"
   cat "${marker_file}"
   echo "</MARKER>"
@@ -343,8 +344,8 @@ function test_cached_across_server_restart() {
 function test_jar_download() {
   serve_jar
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
 http_jar(name = 'endangered', url = 'http://127.0.0.1:$nc_port/lib.jar',
          sha256='$sha256', downloaded_file_name="foo.jar")
 EOF
@@ -373,7 +374,7 @@ EOF
   kill_nc
   expect_log "Tra-la!"
   output_base=$(bazel info output_base)
-  jar_dir=$output_base/external/endangered/jar
+  jar_dir=$output_base/external/+_repo_rules+endangered/jar
   [[ -f ${jar_dir}/foo.jar ]] || fail "${jar_dir}/foo.jar not found"
 }
 
@@ -381,8 +382,8 @@ function test_http_to_https_redirect() {
   serve_redirect https://127.0.0.1:123456789/bad-port-shouldnt-work
 
   cd ${WORKSPACE_DIR}
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(
     name = 'toto',
     urls = ['http://127.0.0.1:$redirect_port/toto'],
@@ -400,8 +401,8 @@ function test_http_404() {
   serve_not_found "Help, I'm lost!"
 
   cd ${WORKSPACE_DIR}
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(
     name = 'toto',
     urls = ['http://127.0.0.1:$nc_port/toto'],
@@ -414,8 +415,8 @@ EOF
 }
 
 function test_deferred_download_unwaited() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
-load("hang.bzl", "hang")
+  cat >> $(setup_module_dot_bazel) <<'EOF'
+hang = use_repo_rule("//:hang.bzl", "hang")
 
 hang(name="hang")
 EOF
@@ -453,7 +454,9 @@ function test_deferred_download_two_parallel_downloads() {
 
   startup_server "${server_dir}"
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  # TODO: https://github.com/bazelbuild/bazel/issues/23234
+  # This test hangs after moving to MODULE.bazel
+  cat > WORKSPACE <<'EOF'
 load("defer.bzl", "defer")
 
 defer(name="defer")
@@ -488,7 +491,7 @@ EOF
   touch BUILD
 
   # Start Bazel
-  bazel query @defer//:all >& $TEST_log &
+  bazel query --enable_workspace @defer//:all >& $TEST_log &
   local bazel_pid=$!
 
   # Wait until the .download() calls return
@@ -512,8 +515,10 @@ EOF
 }
 
 function test_deferred_download_error() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
-load("defer.bzl", "defer")
+  # TODO: https://github.com/bazelbuild/bazel/issues/23234
+  # This test hangs after moving to MODULE.bazel
+  cat > WORKSPACE <<'EOF'
+load("//:defer.bzl", "defer")
 
 defer(name="defer")
 EOF
@@ -536,7 +541,7 @@ EOF
   touch BUILD
 
   # Start Bazel
-  bazel query @defer//:all >& $TEST_log && fail "Bazel unexpectedly succeeded"
+  bazel query --enable_workspace @defer//:all >& $TEST_log && fail "Bazel unexpectedly succeeded"
   expect_log "Error downloading.*doesnotexist"
   expect_not_log "survived wait"
 }
@@ -555,9 +560,10 @@ function test_deferred_download_smoke() {
 
   startup_server "${server_dir}"
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  # TODO: https://github.com/bazelbuild/bazel/issues/23234
+  # This test hangs after moving to MODULE.bazel
+  cat > WORKSPACE <<'EOF'
 load("defer.bzl", "defer")
-
 defer(name="defer")
 EOF
 
@@ -581,7 +587,7 @@ EOF
   touch BUILD
 
   # Start Bazel
-  bazel query @defer//:all-targets >& $TEST_log &
+  bazel query --enable_workspace @defer//:all-targets >& $TEST_log &
   local bazel_pid=$!
 
   # Wait until the .download() call returns
@@ -606,8 +612,8 @@ EOF
   serve_file $test_file
   cd ${WORKSPACE_DIR}
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(name = 'toto', urls = ['http://127.0.0.1:$nc_port/toto'],
     sha256 = '$sha256', executable = True)
 EOF
@@ -637,8 +643,8 @@ function test_http_timeout() {
   serve_timeout
 
   cd ${WORKSPACE_DIR}
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(
     name = 'toto',
     urls = ['http://127.0.0.1:$nc_port/toto'],
@@ -664,8 +670,8 @@ function test_http_redirect() {
   cd ${WORKSPACE_DIR}
   serve_redirect "http://127.0.0.1:$nc_port/toto"
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(name = 'toto', urls = ['http://127.0.0.1:$redirect_port/toto'],
     sha256 = '$sha256')
 EOF
@@ -698,8 +704,8 @@ function test_empty_file() {
   local sha256=$(sha256sum x.tar.gz | cut -f 1 -d ' ')
   serve_file x.tar.gz
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.tar.gz",
@@ -789,8 +795,8 @@ EOF
     workspace_file_attr="workspace_file_content = 'workspace(name=\"endangered-fox\")'"
   fi
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = 'endangered',
     url = 'http://127.0.0.1:$nc_port/repo.zip',
@@ -811,7 +817,7 @@ EOF
 
   cat > zoo/female.sh <<EOF
 #!/bin/sh
-cat ../endangered/fox/male
+cat ../+_repo_rules+endangered/fox/male
 EOF
   chmod +x zoo/female.sh
 
@@ -824,15 +830,24 @@ EOF
 function test_fetch() {
   serve_jar
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
+  cat > $(setup_module_dot_bazel) <<EOF
+ext = use_extension("//:ext.bzl", "ext")
+use_repo(ext, "endangered")
+EOF
+
+  touch BUILD
+  cat > ext.bzl <<EOF
 load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
-jvm_maven_import_external(
-    name = 'endangered',
-    artifact = "com.example.carnivore:carnivore:1.23",
-    server_urls = ['http://127.0.0.1:$nc_port/'],
-    artifact_sha256 = '$sha256',
-)
-bind(name = 'mongoose', actual = '@endangered//jar')
+
+def repo():
+  jvm_maven_import_external(
+      name = 'endangered',
+      artifact = "com.example.carnivore:carnivore:1.23",
+      server_urls = ['http://127.0.0.1:$nc_port/'],
+      artifact_sha256 = '$sha256',
+  )
+
+ext = module_extension(implementation = lambda ctx: repo())
 EOF
 
   output_base=$(bazel info output_base)
@@ -868,8 +883,8 @@ function test_prefix_stripping_tar_gz() {
   local sha256=$(sha256sum x.tar.gz | cut -f 1 -d ' ')
   serve_file x.tar.gz
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.tar.gz",
@@ -889,7 +904,7 @@ EOF
   touch BUILD
 
   bazel build @x//:catter &> $TEST_log || fail "Build failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
 }
 
 function test_prefix_stripping_zip() {
@@ -899,8 +914,8 @@ function test_prefix_stripping_zip() {
   local sha256=$(sha256sum x.zip | cut -f 1 -d ' ')
   serve_file x.zip
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.zip",
@@ -920,7 +935,7 @@ EOF
   touch BUILD
 
   bazel build @x//:catter &> $TEST_log || fail "Build failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
 }
 
 function test_prefix_stripping_existing_repo() {
@@ -939,8 +954,8 @@ EOF
   local sha256=$(sha256sum x.zip | cut -f 1 -d ' ')
   serve_file x.zip
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.zip",
@@ -950,7 +965,7 @@ http_archive(
 EOF
 
   bazel build @x//:catter &> $TEST_log || fail "Build failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
 }
 
 function test_adding_prefix_zip() {
@@ -960,8 +975,8 @@ function test_adding_prefix_zip() {
   local sha256=$(sha256sum z.zip | cut -f 1 -d ' ')
   serve_file z.zip
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "ws",
     url = "http://127.0.0.1:$nc_port/z.zip",
@@ -981,7 +996,7 @@ EOF
   touch BUILD
 
   bazel build @ws//:catter &> $TEST_log || fail "Build failed"
-  assert_contains "abc" bazel-genfiles/external/ws/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+ws/catter.out
 }
 
 function test_adding_and_stripping_prefix_zip() {
@@ -991,8 +1006,8 @@ function test_adding_and_stripping_prefix_zip() {
   local sha256=$(sha256sum z.zip | cut -f 1 -d ' ')
   serve_file z.zip
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "ws",
     url = "http://127.0.0.1:$nc_port/z.zip",
@@ -1013,7 +1028,7 @@ EOF
   touch BUILD
 
   bazel build @ws//:catter &> $TEST_log || fail "Build failed"
-  assert_contains "abc" bazel-genfiles/external/ws/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+ws/catter.out
 }
 
 function test_moving_build_file() {
@@ -1022,8 +1037,8 @@ function test_moving_build_file() {
   local sha256=$(sha256sum x.tar.gz | cut -f 1 -d ' ')
   serve_file x.tar.gz
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.tar.gz",
@@ -1042,13 +1057,13 @@ genrule(
 EOF
 
   bazel build @x//:catter &> $TEST_log || fail "Build 1 failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
   mv x.BUILD x.BUILD.new || fail "Moving x.BUILD failed"
-  sed 's/x.BUILD/x.BUILD.new/g' WORKSPACE > WORKSPACE.tmp || \
-    fail "Editing WORKSPACE failed"
-  mv WORKSPACE.tmp WORKSPACE
+  sed 's/x.BUILD/x.BUILD.new/g' MODULE.bazel > MODULE.bazel.tmp || \
+    fail "Editing MODULE.bazel failed"
+  mv MODULE.bazel.tmp MODULE.bazel
   bazel build @x//:catter &> $TEST_log || fail "Build 2 failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
 }
 
 function test_changing_build_file() {
@@ -1059,8 +1074,8 @@ function test_changing_build_file() {
   local sha256=$(sha256sum x.tar.gz | cut -f 1 -d ' ')
   serve_file x.tar.gz
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "x",
     url = "http://127.0.0.1:$nc_port/x.tar.gz",
@@ -1087,12 +1102,12 @@ genrule(
 EOF
 
   bazel build @x//:catter || fail "Build 1 failed"
-  assert_contains "abc" bazel-genfiles/external/x/catter.out
-  sed 's/x.BUILD/x.BUILD.new/g' WORKSPACE > WORKSPACE.tmp || \
-    fail "Editing WORKSPACE failed"
-  mv WORKSPACE.tmp WORKSPACE
+  assert_contains "abc" bazel-genfiles/external/+_repo_rules+x/catter.out
+  sed 's/x.BUILD/x.BUILD.new/g' MODULE.bazel > MODULE.bazel.tmp || \
+    fail "Editing MODULE.bazel failed"
+  mv MODULE.bazel.tmp MODULE.bazel
   bazel build @x//:catter &> $TEST_log || fail "Build 2 failed"
-  assert_contains "def" bazel-genfiles/external/x/catter.out
+  assert_contains "def" bazel-genfiles/external/+_repo_rules+x/catter.out
 }
 
 function test_android_sdk_basic_load() {
@@ -1105,14 +1120,14 @@ android_sdk_repository(
 )
 EOF
 
-  bazel query "//external:androidsdk" 2> "$TEST_log" > "$TEST_TMPDIR/queryout" \
+  bazel query --enable_workspace "//external:androidsdk" 2> "$TEST_log" > "$TEST_TMPDIR/queryout" \
       || fail "Expected success"
   cat "$TEST_TMPDIR/queryout" > "$TEST_log"
   expect_log "//external:androidsdk"
 }
 
 function test_use_bind_as_repository() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  cat > WORKSPACE <<'EOF'
 load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(name = 'foobar', path = 'foo')
 bind(name = 'foo', actual = '@foobar//:test')
@@ -1129,12 +1144,13 @@ genrule(
     outs = ["foo.txt"],
 )
 EOF
-  bazel build :foo &> "$TEST_log" && fail "Expected failure" || true
+  bazel build --enable_workspace :foo &> "$TEST_log" && fail "Expected failure" || true
   expect_log "No repository visible as '@foo' from main repository"
 }
 
 function test_bind_repo_mapping() {
-  cat >> $(create_workspace_with_default_repos WORKSPACE myws) <<'EOF'
+  cat > WORKSPACE <<'EOF'
+workspace(name = "myws")
 load('//:foo.bzl', 'foo')
 foo()
 bind(name='bar', actual='@myws//:something')
@@ -1146,14 +1162,14 @@ EOF
   cat > BUILD <<'EOF'
 filegroup(name='something', visibility=["//visibility:public"])
 EOF
-  bazel build //external:foo //external:bar &> "$TEST_log" || fail "don't fail!"
+  bazel build --enable_workspace //external:foo //external:bar &> "$TEST_log" || fail "don't fail!"
 }
 
 function test_flip_flopping() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   touch BUILD foo
   zip -r repo.zip *
   sha256=$(sha256sum repo.zip | head -c 64)
@@ -1164,14 +1180,14 @@ function test_flip_flopping() {
   cd -
 
   cat > local_ws <<EOF
-load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(
     name = "repo",
     path = "$REPO_PATH",
 )
 EOF
   cat > remote_ws <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     url = "http://127.0.0.1:$fileserver_port/repo.zip",
@@ -1180,14 +1196,14 @@ http_archive(
 EOF
   external_dir=$(bazel info output_base)/external
   for i in $(seq 1 3); do
-    cp local_ws WORKSPACE
+    cp local_ws MODULE.bazel
     bazel build @repo//:all &> $TEST_log || fail "Build failed"
-    test -L "$external_dir/repo" || fail "creating local symlink failed"
-    test -a "$external_dir/repo/bar" || fail "bar not found"
-    cp remote_ws WORKSPACE
+    test -L "$external_dir/+_repo_rules+repo" || fail "creating local symlink failed"
+    test -a "$external_dir/+_repo_rules+repo/bar" || fail "bar not found"
+    cp remote_ws MODULE.bazel
     bazel build @repo//:all &> $TEST_log || fail "Build failed"
-    test -d "$external_dir//repo" || fail "creating remote repo failed"
-    test -a "$external_dir/repo/foo" || fail "foo not found"
+    test -d "$external_dir/+_repo_rules+repo" || fail "creating remote repo failed"
+    test -a "$external_dir/+_repo_rules+repo/foo" || fail "foo not found"
   done
 
   shutdown_server
@@ -1197,13 +1213,13 @@ function test_sha256_weird() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   zip -r repo.zip *
   startup_server $PWD
   cd -
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     sha256 = "a random string",
@@ -1219,13 +1235,13 @@ function test_sha256_incorrect() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   zip -r repo.zip *
   startup_server $PWD
   cd -
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     sha256 = "61a6f762aaf60652cbf332879b8dcc2cfd81be2129a061da957d039eae77f0b0",
@@ -1242,15 +1258,15 @@ function test_integrity_correct() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   touch BUILD
   zip -r repo.zip *
   integrity="sha256-$(cat repo.zip | openssl dgst -sha256 -binary | openssl base64 -A)"
   startup_server $PWD
   cd -
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     integrity = "$integrity",
@@ -1265,14 +1281,14 @@ function test_integrity_weird() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   touch BUILD
   zip -r repo.zip *
   startup_server $PWD
   cd -
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     integrity = "a random string",
@@ -1288,15 +1304,15 @@ function test_integrity_incorrect() {
   REPO_PATH=$TEST_TMPDIR/repo
   mkdir -p "$REPO_PATH"
   cd "$REPO_PATH"
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   touch BUILD
   zip -r repo.zip *
   integrity="sha256-$(cat repo.zip | openssl dgst -sha256 -binary | openssl base64 -A)"
   startup_server $PWD
   cd -
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "repo",
     integrity = "sha256-Yab3Yqr2BlLL8zKHm43MLP2BviEpoGHalX0Dnq538LA=",
@@ -1320,8 +1336,8 @@ function test_same_name() {
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1353,8 +1369,8 @@ function test_missing_build() {
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1412,8 +1428,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1425,7 +1441,7 @@ EOF
 }
 
 function test_failing_fetch_with_keep_going() {
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   cat > BUILD <<'EOF'
 package(default_visibility = ["//visibility:public"])
 
@@ -1467,8 +1483,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1492,6 +1508,9 @@ function test_repository_cache_relative_path() {
   # Verify that --repository_cache works for query and caches soly
   # based on the predicted hash, for a repository-cache location given as path
   # relative to the WORKSPACE
+
+  add_to_bazelrc "common --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
   mkdir ext
@@ -1518,8 +1537,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1546,8 +1565,8 @@ EOF
   bazel clean --expunge
   # Even with a different source URL, the cache should be consulted.
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1566,6 +1585,9 @@ test_default_cache()
   # Verify that the default cache works for query and caches soly
   # based on the predicted hash, for a repository-cache location given as path
   # relative to the WORKSPACE
+
+  add_to_bazelrc "common --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
   mkdir ext
@@ -1589,8 +1611,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1613,8 +1635,8 @@ EOF
   bazel clean --expunge
   # Even with a different source URL, the cache should be consulted.
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1647,8 +1669,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1669,6 +1691,9 @@ EOF
 
 function test_cache_split() {
   # Verify that the canonical_id is honored to logically split the cache
+
+  add_to_bazelrc "common --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
   mkdir ext
@@ -1686,8 +1711,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1707,7 +1732,7 @@ EOF
   bazel build '@ext//:foo' || fail "expected success"
 
   # Now, change the canonical_id
-  ed WORKSPACE <<'EOF'
+  ed MODULE.bazel <<'EOF'
 /canonical_id
 s|"|"modified_
 w
@@ -1717,7 +1742,7 @@ EOF
   bazel build '@ext//:foo' && fail "should not have a cache hit now" || :
 
   # However, removing the canonical_id, we should get a cache hit again
-  ed WORKSPACE <<'EOF'
+  ed MODULE.bazel <<'EOF'
 /canonical_id
 d
 w
@@ -1747,8 +1772,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1787,6 +1812,9 @@ EOF
 function test_repository_cache() {
   # Verify that --repository_cache works for query and caches soly
   # based on the predicted hash.
+
+  add_to_bazelrc "common --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
   mkdir ext
@@ -1814,8 +1842,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1842,8 +1870,8 @@ EOF
   bazel clean --expunge
   # Even with a different source URL, the cache should be consulted.
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -1877,9 +1905,9 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("//:rule.bzl", "probe")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+probe = use_repo_rule("//:rule.bzl", "probe")
 
 http_archive(
   name = "ext",
@@ -1948,6 +1976,9 @@ function test_cache_hit_reported() {
   # if an error happened in that repository. This information
   # is useful as users sometimes change the URL but do not
   # update the hash.
+
+  add_to_bazelrc "common --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
   mkdir ext-1.1
@@ -1966,8 +1997,8 @@ EOF
   rm -rf main
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-1.1",
@@ -2004,7 +2035,7 @@ EOF
   expect_not_log 'file:.*/ext-1.1.zip'
 
   # Now update ext-1.1 to ext-1.2, while forgetting to update the checksum
-  ed WORKSPACE <<EOI
+  ed MODULE.bazel <<EOI
 %s/ext-1\.1/ext-1\.2/g
 w
 q
@@ -2027,7 +2058,7 @@ EOI
   # an assumption on a wrong path. As the fetching of the external
   # repository will fail, we still expect being hinted at the
   # cache hit.
-  ed WORKSPACE <<'EOI'
+  ed MODULE.bazel <<'EOI'
 /strip_prefix
 d
 a
@@ -2068,8 +2099,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2122,8 +2153,8 @@ ext_file = repository_rule(
   attrs = { "urls" : attr.string_list(), "sha256" : attr.string() },
 )
 EOF
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("//:ext_file.bzl", "ext_file")
+  cat > $(setup_module_dot_bazel) <<EOF
+ext_file = use_repo_rule("//:ext_file.bzl", "ext_file")
 ext_file(
   name="ext",
   urls=["http://doesnotexist.example.com/outdatedpath/actual_file_name.txt"],
@@ -2165,8 +2196,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2209,8 +2240,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2246,8 +2277,8 @@ function test_good_symlinks() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2291,8 +2322,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2335,8 +2366,8 @@ function test_bad_symlinks() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -2380,8 +2411,8 @@ with_progress = repository_rule(
 )
 EOF
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
-load("//:rule.bzl", "with_progress")
+  cat >> $(setup_module_dot_bazel) <<'EOF'
+with_progress = use_repo_rule("//:rule.bzl", "with_progress")
 with_progress(name="foo")
 EOF
   cat > BUILD <<'EOF'
@@ -2408,8 +2439,8 @@ function test_progress_reporting() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name = "ext",
   urls = ["file://${WRKDIR}/ext.tar"],
@@ -2427,7 +2458,7 @@ EOF
 
   bazel build //:it > "${TEST_log}" 2>&1 && fail "Expected failure" || :
 
-  expect_log '@ext.*badargument'
+  expect_log '@@+_repo_rules+ext.*badargument'
 }
 
 function test_prefix_suggestions() {
@@ -2444,8 +2475,8 @@ function test_prefix_suggestions() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-1.0",
@@ -2477,8 +2508,8 @@ function test_suggest_nostripprefix() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-1.0",
@@ -2508,12 +2539,12 @@ function test_loaded_file_reported() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  cat > WORKSPACE <<'EOF'
 load("@nonexistent//path/to/package:file/to/import.bzl", "foo")
 foo()
 EOF
   touch BUILD
-  bazel build //... > "${TEST_log}" 2>&1 && fail "Expected failure"
+  bazel build --enable_workspace //... > "${TEST_log}" 2>&1 && fail "Expected failure"
 
   expect_log '@nonexistent//path/to/package:file/to/import.bzl'
   expect_log 'nonexistent.*repository.*WORKSPACE'
@@ -2532,8 +2563,8 @@ function test_report_files_searched() {
 
   mkdir -p path/to/workspace
   cd path/to/workspace
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   urls=["file://${WRKDIR}/ext.tar"],
@@ -2564,8 +2595,8 @@ function test_report_package_external() {
 
   mkdir -p path/to/workspace
   cd path/to/workspace
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   urls=["file://${WRKDIR}/ext.tar"],
@@ -2598,7 +2629,7 @@ function test_location_reported() {
   mkdir -p path/to/main
   cd path/to/main
   touch BUILD
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  cat > WORKSPACE <<'EOF'
 load("//:repos.bzl", "repos")
 repos()
 EOF
@@ -2620,7 +2651,7 @@ def foo_repos():
     )
 EOF
 
-  bazel build @foo//... > "${TEST_log}" 2>&1 && fail "expected failure"
+  bazel build --enable_workspace @foo//... > "${TEST_log}" 2>&1 && fail "expected failure"
   inplace-sed -e "s?$WRKDIR/?WRKDIR/?g" -e "s?$TEST_TMPDIR/?TEST_TMPDIR/?g" "${TEST_log}"
 
   expect_log 'error.*repository.*foo'
@@ -2696,7 +2727,7 @@ load("@a//:notabuildfile.bzl", "x")
 EOF
   touch BUILD
 
-  bazel build //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
+  bazel build --enable_workspace //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
   inplace-sed -e 's?$(pwd)/?PWD/?g' "${TEST_log}"
 
   expect_not_log '[iI]nternal [eE]rror'
@@ -2738,7 +2769,7 @@ data_repo = repository_rule(
 )
 EOF
   touch BUILD
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<'EOF'
+  cat > WORKSPACE <<'EOF'
 load("//:withimplicit.bzl", "data_repo")
 
 data_repo(
@@ -2748,7 +2779,7 @@ data_repo(
 load("@data//:value.bzl", "value")
 EOF
 
-  bazel build //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
+  bazel build --enable_workspace //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
   inplace-sed -e 's?$(pwd)/?PWD/?g' "${TEST_log}"
 
   expect_log "you have to add.*this_repo_is_missing.*WORKSPACE"
@@ -2787,8 +2818,8 @@ function test_overwrite_existing_workspace_build() {
       mkdir main
       cd main
 
-      cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+      cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
    name = "ext",
    strip_prefix = "ext",
@@ -2799,7 +2830,7 @@ EOF
       echo
       ls -al ${WRKDIR}/ext
       echo
-      cat WORKSPACE
+      cat MODULE.bazel
       echo
 
       cat > external_build_file <<'EOF'
@@ -2841,8 +2872,8 @@ function test_external_java_target_depends_on_external_resources() {
   mkdir -p $test_repo1/a
   mkdir -p $test_repo2
 
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+  cat > $(setup_module_dot_bazel) <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(name = 'repo1', path='$test_repo1')
 local_repository(name = 'repo2', path='$test_repo2')
 EOF
@@ -2854,7 +2885,7 @@ java_binary(
 )
 EOF
 
-  touch $test_repo1/WORKSPACE
+  touch $test_repo1/REPO.bazel
   cat > $test_repo1/a/BUILD <<'EOF'
 package(default_visibility = ["//visibility:public"])
 
@@ -2873,7 +2904,7 @@ public class A {
 }
 EOF
 
-  touch $test_repo2/WORKSPACE
+  touch $test_repo2/REPO.bazel
   cat > $test_repo2/BUILD <<'EOF'
 package(default_visibility = ["//visibility:public"])
 
@@ -2891,8 +2922,6 @@ EOF
 }
 
 function test_query_external_packages() {
-  setup_skylib_support
-
   mkdir -p external/nested
   mkdir -p not-external
 
@@ -2916,6 +2945,9 @@ filegroup(
 )
 EOF
 
+  # Remove tools directory set up by copy_tools_directory in testenv.sh
+  rm -rf tools/
+
   bazel query //... >& $TEST_log || fail "Expected build/run to succeed"
   expect_log "//not-external:b"
   expect_not_log "//external:a1"
@@ -2930,8 +2962,6 @@ EOF
 }
 
 function test_query_external_all_targets() {
-  setup_skylib_support
-
   mkdir -p external/nested
   mkdir -p not-external
 
@@ -2951,6 +2981,9 @@ filegroup(
 EOF
   touch not-external/B
 
+  # Remove tools directory set up by copy_tools_directory in testenv.sh
+  rm -rf tools/
+
   bazel query //...:all-targets >& $TEST_log \
     || fail "Expected build/run to succeed"
   expect_log "//not-external:b"
@@ -2978,8 +3011,8 @@ function test_external_deps_skymeld() {
   rm -rf main
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext",
@@ -3000,7 +3033,7 @@ EOF
   bazel build --experimental_merged_skyframe_analysis_execution //:foo \
     || fail 'Expected build to succeed with Skymeld'
 
-  test -h "$execroot/external/ext" || fail "Expected symlink to external repo."
+  test -h "$execroot/external/+_repo_rules+ext" || fail "Expected symlink to external repo."
 }
 
 function test_environ_incrementally() {
@@ -3023,8 +3056,8 @@ EOF
 filegroup(name='dummy', srcs=['BUILD'])
 EOF
   touch BUILD
-  cat > WORKSPACE <<EOF
-load('//:repo.bzl', 'dummy_repository')
+  cat > $(setup_module_dot_bazel) <<EOF
+dummy_repository = use_repo_rule('//:repo.bzl', 'dummy_repository')
 dummy_repository(name = 'foo', build_file = '@@//:BUILD.dummy')
 EOF
 
diff --git a/src/test/shell/bazel/external_patching_test.sh b/src/test/shell/bazel/external_patching_test.sh
index 1e336d02cb5094..809b882ecde319 100755
--- a/src/test/shell/bazel/external_patching_test.sh
+++ b/src/test/shell/bazel/external_patching_test.sh
@@ -72,7 +72,7 @@ fi
 set_up() {
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
-  write_default_lockfile "MODULE.bazel.lock"
+  setup_module_dot_bazel
   # create an archive file with files interesting for patching
   mkdir ext-0.1.2
   cat > ext-0.1.2/foo.sh <<'EOF'
@@ -108,8 +108,8 @@ test_patch_file() {
 -echo Here be dragons...
 +echo There are dragons...
 EOF
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -119,7 +119,6 @@ http_archive(
   patch_cmds = ["find . -name '*.sh' -exec sed -i.orig '1s|#!/usr/bin/env sh\$|/bin/sh\$|' {} +"],
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "foo",
@@ -150,8 +149,8 @@ EOF
       || fail "expected the new patch to be applied"
 
   # Verify that changes to the patches attribute trigger enough rebuilding
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -159,7 +158,6 @@ http_archive(
   build_file_content="exports_files([\"foo.sh\"])",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   bazel build :foo.sh
   foopath=`bazel info bazel-genfiles`/foo.sh
   grep -q 'Here be' $foopath || fail "expected unpatched file"
@@ -182,8 +180,8 @@ EOF
   mkdir main
   cd main
   echo "ignored anyway" > patch_foo.sh
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -193,7 +191,6 @@ http_archive(
   patch_tool = "${EXTREPODIR}/my_patch_tool",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   touch BUILD
 
   bazel build @ext//... >"${TEST_log}" 2>&1 && fail "expected failure" || :
@@ -229,8 +226,8 @@ EOF
  echo There are dragons...
 EOF
 
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -241,7 +238,6 @@ http_archive(
   patches = ["//:local.patch"],
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "foo",
@@ -275,8 +271,8 @@ EOF
   mkdir main
   cd main
 
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -287,7 +283,6 @@ http_archive(
   patches = ["//:local.patch"],
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
 
   bazel build @ext//... &> $TEST_log 2>&1 && fail "Expected to fail"
   expect_log "Error downloading \\[.*/remote.patch\\] to"
@@ -327,8 +322,8 @@ EOF
   mkdir main
   cd main
 
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -341,7 +336,6 @@ http_archive(
   remote_patch_strip = 1,
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "foo",
@@ -392,8 +386,8 @@ EOF
 -echo Here be dragons...
 +echo There are dragons...
 EOF
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+  cat > $(setup_module_dot_bazel) <<EOF
+new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 new_git_repository(
   name="ext",
   remote="${EXTREPODIR}/extgit/.git",
@@ -403,7 +397,6 @@ new_git_repository(
   patch_cmds = ["find . -name '*.sh' -exec sed -i.orig '1s|#!/usr/bin/env sh\$|/bin/sh\$|' {} +"],
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "foo",
@@ -434,8 +427,8 @@ EOF
       || fail "expected the new patch to be applied"
 
   # Verify that changes to the patches attribute trigger enough rebuilding
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+  cat > $(setup_module_dot_bazel) <<EOF
+new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 new_git_repository(
   name="ext",
   remote="${EXTREPODIR}/extgit/.git",
@@ -443,7 +436,6 @@ new_git_repository(
   build_file_content="exports_files([\"foo.sh\"])",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   bazel build :foo.sh
   foopath=`bazel info bazel-genfiles`/foo.sh
   grep -q 'Here be' $foopath || fail "expected unpatched file"
@@ -473,8 +465,8 @@ EOF
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="withbuild",
   strip_prefix="withbuild",
@@ -482,7 +474,6 @@ http_archive(
   build_file="@//:ext.BUILD",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "local",
@@ -532,8 +523,8 @@ EOF
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="withbuild",
   strip_prefix="withbuild",
@@ -549,7 +540,6 @@ genrule(
   """,
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "local",
@@ -600,8 +590,8 @@ EOF
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+  cat > $(setup_module_dot_bazel) <<EOF
+new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 new_git_repository(
   name="withbuild",
   remote="${EXTREPODIR}/withbuild/.git",
@@ -609,7 +599,6 @@ new_git_repository(
   build_file="@//:ext.BUILD",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "local",
@@ -669,8 +658,8 @@ EOF
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+  cat > $(setup_module_dot_bazel) <<EOF
+new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 new_git_repository(
   name="withbuild",
   remote="${EXTREPODIR}/withbuild/.git",
@@ -686,7 +675,6 @@ genrule(
   """,
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "local",
@@ -726,8 +714,8 @@ EOF
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="withbuild",
   strip_prefix="withbuild",
@@ -735,7 +723,6 @@ http_archive(
   build_file="@//:ext.BUILD",
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "local",
@@ -793,8 +780,8 @@ index 1f4c41e..9d548ff 100644
 2.18.0.rc1.244.gcf134e6275-goog
 
 EOF
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="ext",
   strip_prefix="ext-0.1.2",
@@ -805,7 +792,6 @@ http_archive(
   patch_cmds = ["find . -name '*.sh' -exec sed -i.orig '1s|#!/usr/bin/env sh\$|/bin/sh\$|' {} +"],
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
   cat > BUILD <<'EOF'
 genrule(
   name = "foo",
diff --git a/src/test/shell/bazel/external_path_test.sh b/src/test/shell/bazel/external_path_test.sh
index 231e7e29adc1ce..16765ac98d1395 100755
--- a/src/test/shell/bazel/external_path_test.sh
+++ b/src/test/shell/bazel/external_path_test.sh
@@ -29,7 +29,7 @@ repo_with_local_include() {
   # Generate a repository, in the current working directory, with a target
   # //src:hello that includes a file via a local path.
 
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   mkdir src
   cat > src/main.c <<'EOF'
 #include <stdio.h>
@@ -57,7 +57,7 @@ library_with_local_include() {
   # is a library with headers that include via paths relative to the root of
   # that repository
 
-  create_workspace_with_default_repos WORKSPACE
+  setup_module_dot_bazel
   mkdir lib
   cat > lib/lib.h <<'EOF'
 #include "lib/constants.h"
@@ -115,8 +115,8 @@ test_local_paths_remote() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="remote",
   strip_prefix="remote",
@@ -142,7 +142,6 @@ test_lib_paths_main() {
   cd main
   library_with_local_include
 
-  create_workspace_with_default_repos WORKSPACE
   cat > main.c <<'EOF'
 #include "lib/lib.h"
 
@@ -180,8 +179,8 @@ test_lib_paths_remote() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="remote",
   strip_prefix="remote",
@@ -246,8 +245,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="remotelib",
   strip_prefix="remotelib",
@@ -268,6 +267,7 @@ repo_with_local_path_reference() {
   # create, in the current working directory, a package called
   # withpath, that contains rule depending on hard-code path relative
   # to the repository root.
+  setup_module_dot_bazel
   mkdir -p withpath
   cat > withpath/BUILD <<'EOF'
 genrule(
@@ -295,7 +295,6 @@ test_fixed_path_local() {
 
   mkdir main
   cd main
-  create_workspace_with_default_repos WORKSPACE
   repo_with_local_path_reference
 
   bazel build //withpath:it || fail "Expected success"
@@ -314,8 +313,8 @@ DISABLED_test_fixed_path_remote() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="remote",
   strip_prefix="remote",
@@ -330,6 +329,7 @@ repo_with_local_implicit_dependencies() {
   # that has an implicit dependency on a target in the same repository;
   # the point here is that this dependency can be named without knowledge
   #  of the repository name.
+  setup_module_dot_bazel
   mkdir -p rule
   cat > rule/BUILD <<'EOF'
 exports_files(["to_upper.sh"])
@@ -369,7 +369,6 @@ test_local_rules() {
 
   mkdir main
   cd main
-  create_workspace_with_default_repos WORKSPACE
   repo_with_local_implicit_dependencies
   mkdir call
   echo hello world > call/hello.txt
@@ -398,8 +397,8 @@ test_remote_rules() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="r",
   strip_prefix="remote",
@@ -447,8 +446,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="a",
   strip_prefix="a",
@@ -468,6 +467,7 @@ repo_with_embedded_paths() {
   # create, in the current working directory, a package called rule
   # that has an implicit dependency on a target in the same repository
   # that is referred-to by an embedded path.
+  setup_module_dot_bazel
   mkdir -p rule
   cat > rule/preamb.html <<'EOF'
 <html>
@@ -528,7 +528,6 @@ test_embedded_local() {
   cd "${WRKDIR}"
 
   mkdir main
-  create_workspace_with_default_repos WORKSPACE
   repo_with_embedded_paths
   mkdir call
   cat > call/plain.txt <<'EOF'
@@ -560,8 +559,8 @@ test_embedded_remote() {
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="r",
   strip_prefix="remote",
@@ -613,8 +612,8 @@ EOF
 
   mkdir main
   cd main
-  cat >> $(create_workspace_with_default_repos WORKSPACE) <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat > $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="r",
   strip_prefix="r",
@@ -634,6 +633,7 @@ repo_with_embedded_foreign_path() {
   # create, in the current working directory, a package called
   # rule that has an implicit dependency on @data//:file.txt, a target
   # of a different, external, repository.
+  setup_module_dot_bazel
   mkdir -p rule
   cat > rule/BUILD <<'EOF'
 genrule(
@@ -675,7 +675,7 @@ EOF
 
 repo_data_file() {
   # Create, in the current directory, an archive of a data repository containing
-  # //:file.txt, and add a corresponding entry to ./main/WORKSPACE.
+  # //:file.txt, and add a corresponding entry to ./main/MODULE.bazel.
   mkdir data
   cat > data/file.txt <<'EOF'
 Copyright ...
@@ -685,15 +685,14 @@ exports_files(["file.txt"], visibility = ["//visibility:public"])
 EOF
   tar cvf data.tar data
   rm -rf data
-  cat >> main/WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel "main/MODULE.bazel") <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="data",
   strip_prefix="data",
   urls=["file://$(pwd)/data.tar"],
 )
 EOF
-  write_default_lockfile "main/MODULE.bazel.lock"
 }
 
 test_embedded_foreign_paths_local() {
@@ -734,7 +733,7 @@ test_embedded_foreign_paths_remote() {
   (cd rule && repo_with_embedded_foreign_path)
   tar cvf rule.tar rule
   rm -rf rule
-  cat >> main/WORKSPACE <<EOF
+  cat >> $(setup_module_dot_bazel "main/MODULE.bazel") <<EOF
 http_archive(
   name="rule",
   strip_prefix="rule",
diff --git a/src/test/shell/bazel/external_remote_file_test.sh b/src/test/shell/bazel/external_remote_file_test.sh
index 7fc3a291035ca6..51c6abe59ae701 100755
--- a/src/test/shell/bazel/external_remote_file_test.sh
+++ b/src/test/shell/bazel/external_remote_file_test.sh
@@ -72,7 +72,7 @@ fi
 function set_up() {
   WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
   cd "${WRKDIR}"
-  write_default_lockfile "MODULE.bazel.lock"
+  setup_module_dot_bazel
   # create an archive file with files interesting for patching
   mkdir hello_world-0.1.2
   cat > hello_world-0.1.2/hello_world.c <<'EOF'
@@ -117,25 +117,25 @@ cc_binary(
 )
 EOF
   touch BUILD.bazel
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
     "child/foo_bar.c": ["${EXTREPOURL}/child/foo_bar.c"],
     "child/BUILD.bazel": ["${EXTREPOURL}/child/BUILD.bazel"],
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//child:foo_bar
 }
@@ -153,27 +153,27 @@ cc_binary(
     srcs = ["hello_world.c"],
 )
 EOF
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
   },
   remote_file_integrity={
-    "WORKSPACE": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
+    "REPO.bazel": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
     "BUILD.bazel": "sha256-0bs+dwSOzHTbNAgDS02I3giLAZu2/NLn7BJWwQGN/Pk=",
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//:hello_world
 }
@@ -191,27 +191,27 @@ cc_binary(
     srcs = ["hello_world.c"],
 )
 EOF
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
   },
   remote_file_integrity={
-    "WORKSPACE": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFZ=",
+    "REPO.bazel": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFZ=",
     "BUILD.bazel": "sha256-0bs+dwSOzHTbNAgDS02I3giLAZu2/NLn7BJWwQGN/Pk=",
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
   expect_log "but wanted sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFY="
@@ -230,23 +230,23 @@ cc_binary(
     srcs = ["hello_world.c"],
 )
 EOF
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//:hello_world
 }
@@ -264,23 +264,23 @@ cc_binary(
     srcs = ["hello_world.c"],
 )
 EOF
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "../../../WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "../../../REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
   expect_log "Error in download: Cannot write outside of the repository directory"
@@ -298,23 +298,23 @@ cc_binary(
     srcs = ["hello_world.c"],
 )
 EOF
-  touch WORKSPACE
+  touch REPO.bazel
 
   mkdir main
   cd main
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+  cat >> $(setup_module_dot_bazel) <<EOF
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
   name="hello_world",
   strip_prefix="hello_world-0.1.2",
   urls=["${EXTREPOURL}/hello_world.zip"],
   remote_file_urls={
-    "/tmp/WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
+    "/tmp/REPO.bazel": ["${EXTREPOURL}/REPO.bazel"],
     "BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
   },
 )
 EOF
-  write_default_lockfile "MODULE.bazel.lock"
+  add_rules_cc "MODULE.bazel"
 
   bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
   expect_log "Error in download: Cannot write outside of the repository directory"
diff --git a/src/test/shell/bazel/external_starlark_execute_test.sh b/src/test/shell/bazel/external_starlark_execute_test.sh
index b06729ec2a9cc9..5a971747e18589 100755
--- a/src/test/shell/bazel/external_starlark_execute_test.sh
+++ b/src/test/shell/bazel/external_starlark_execute_test.sh
@@ -40,8 +40,8 @@ def _impl(ctx):
 
 changing_repo = repository_rule(_impl)
 EOF
-    cat > WORKSPACE <<'EOF'
-load("//:repo.bzl", "changing_repo")
+    cat > $(setup_module_dot_bazel) <<'EOF'
+changing_repo = use_repo_rule("//:repo.bzl", "changing_repo")
 
 changing_repo(name="change")
 EOF
@@ -53,7 +53,6 @@ genrule(
   cmd = "cp $< $@",
 )
 EOF
-    write_default_lockfile "MODULE.bazel.lock"
     bazel build //:it
     cp `bazel info bazel-genfiles`/it.txt output
     cat output
@@ -90,12 +89,11 @@ def _impl(ctx):
 waiting_repo = repository_rule(_impl)
 EOF
 
-    cat > WORKSPACE <<'EOF'
-load("//:repo.bzl", "waiting_repo")
+    cat > $(setup_module_dot_bazel) <<'EOF'
+waiting_repo = use_repo_rule("//:repo.bzl", "waiting_repo")
 
 waiting_repo(name="wait")
 EOF
-    write_default_lockfile "MODULE.bazel.lock"
     cat > BUILD <<'EOF'
 genrule(
   name = "it",
diff --git a/src/test/shell/bazel/external_starlark_load_test.sh b/src/test/shell/bazel/external_starlark_load_test.sh
index 4d1628f2b30063..e552671d5f847e 100755
--- a/src/test/shell/bazel/external_starlark_load_test.sh
+++ b/src/test/shell/bazel/external_starlark_load_test.sh
@@ -47,8 +47,8 @@ function run_external_starlark_load_test() {
   create_new_workspace
   external_repo=${new_workspace_dir}
 
-  cat > ${WORKSPACE_DIR}/WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+  cat > ${WORKSPACE_DIR}/MODULE.bazel <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(name = "external_repo", path = "${external_repo}")
 EOF
 
@@ -116,7 +116,7 @@ function test_load_starlark_from_external_repo_with_repo_relative_label_load() {
 function test_starlark_repository_relative_label() {
   repo2=$TEST_TMPDIR/repo2
   mkdir -p $repo2
-  touch $repo2/WORKSPACE $repo2/BUILD
+  touch $repo2/REPO.bazel $repo2/BUILD
   cat > $repo2/remote.bzl <<EOF
 def _impl(ctx):
   print(Label("//foo:bar"))
@@ -126,8 +126,8 @@ remote_rule = rule(
 )
 EOF
 
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+  cat > MODULE.bazel <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(
     name = "r",
     path = "$repo2",
@@ -159,8 +159,8 @@ function test_starlark_repository_nested_relative_label() {
   mkdir -p $repo1 $repo2
 
   # local
-  cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+  cat > MODULE.bazel <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 local_repository(
     name = "r1",
     path = "$repo1",
@@ -180,7 +180,7 @@ genrule(
 EOF
 
   # r1
-  touch $repo1/WORKSPACE
+  touch $repo1/REPO.bazel
   cat > $repo1/BUILD <<EOF
 load('@r2//:remote.bzl', 'remote_rule')
 
@@ -191,7 +191,7 @@ remote_rule(
 EOF
 
   # r2
-  touch $repo2/WORKSPACE $repo2/BUILD
+  touch $repo2/REPO.bazel $repo2/BUILD
   cat > $repo2/remote.bzl <<EOF
 def _impl(ctx):
   print(Label("//foo:bar"))
@@ -259,7 +259,7 @@ test_rule = rule(
 )
 EOF
 
-  bazel build //:tr || fail "build failed"
+  bazel build --enable_workspace //:tr || fail "build failed"
 }
 
 run_suite "Test Starlark loads from/in external repositories"