diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh
index 61d131b9e..6bc0165b7 100755
--- a/tests/apex_comparison_tests.sh
+++ b/tests/apex_comparison_tests.sh
@@ -58,7 +58,7 @@ packages/modules/common/build/build_unbundled_mainline_module.sh \
 ######################
 build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2build
 
-BAZEL_OUT="$(call_bazel info --config=bp2build output_path)"
+BAZEL_OUT="$(call_bazel info output_path)"
 
 export TARGET_PRODUCT="module_arm"
 call_bazel build --config=bp2build --config=ci --config=android \
diff --git a/tests/mixed_mode_test.sh b/tests/mixed_mode_test.sh
index f6fffad4b..b408fd325 100755
--- a/tests/mixed_mode_test.sh
+++ b/tests/mixed_mode_test.sh
@@ -14,9 +14,7 @@ function test_bazel_smoke {
   setup
   create_mock_bazel
 
-  run_soong bp2build
-
-  run_bazel info --config=bp2build
+  STANDALONE_BAZEL=true run_bazel info
 }
 
 test_bazel_smoke