diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index c12c3544d..1bc005784 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -100,10 +100,12 @@ resource_rules_bzlmod: &resource_rules_bzlmod
     <<: *rules_flags
     ? "--enable_bzlmod"
     ? "--enable_workspace=false"
+    ? "--//rules/flags:manifest_merge_order=legacy"
   test_flags:
     <<: *rules_flags
     ? "--enable_bzlmod"
     ? "--enable_workspace=false"
+    ? "--//rules/flags:manifest_merge_order=legacy"
   <<: *resource_rules
 
 tasks:
@@ -115,20 +117,21 @@ tasks:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
     <<: *rules
-  # TODO(#397): Resource tests need some more debugging.
-  ## resource_rules:
-  ##   platform: ${{ platform }}
+  # TODO(#397): Resource tests on WORKSPACE need some more debugging.
+  ## resource_rules_ubuntu2004:
+  ##   name: "Resource rules on Linux with Bazel {bazel} and bzlmod disabled"
+  ##   platform: ubuntu2004
   ##   bazel: ${{ bazel }}
   ##   <<: *resource_rules
   tools_bzlmod:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
     <<: *tools_bzlmod
-  # TODO(#397): Resource tests need some more debugging.
-  ## resource_rules_bzlmod:
-  ##   platform: ${{ platform }}
-  ##   bazel: ${{ bazel }}
-  ##   <<: *resource_rules_bzlmod
+  resource_rules_ubuntu2004_bzlmod:
+    name: "Resource rules with Bazel {bazel} and bzlmod enabled"
+    platform: ubuntu2004
+    bazel: ${{ bazel }}
+    <<: *resource_rules_bzlmod
   rules_bzlmod:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
diff --git a/test/rules/resources/test.bzl b/test/rules/resources/test.bzl
index 23f319e7e..dc5776a53 100644
--- a/test/rules/resources/test.bzl
+++ b/test/rules/resources/test.bzl
@@ -179,6 +179,7 @@ def _starlark_process_test_impl(ctx):
         runfiles = r_java.runtime_output_jars + [ctx.executable._r_class_check]
         java = ctx.attr._host_javabase[java_common.JavaRuntimeInfo]
         args["java"] = java.java_executable_exec_path
+        java = ctx.attr._host_javabase[DefaultInfo]
 
     elif ctx.attr.expected_r_class_fields:
         fail("Expected a R.java file but none was generated")
@@ -191,7 +192,6 @@ set -eu
 
 EXPECTED_R_CLASS_FIELDS="{expected_r_class_fields}"
 if [ "{check_r_java}" == "True" ]; then
-
     # Check the contents of the resources jar, as it is always produced.
     # There are cases when it is produced empty (with only META-INF data).
     # If there is no R.class generated and the expectation is no resource