diff --git a/envsetup.sh b/envsetup.sh
index f668af7355..9b47d3baac 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1844,6 +1844,11 @@ function _trigger_build()
 # Convenience entry point (like m) to use Bazel in AOSP.
 function b()
 (
+    # zsh breaks posix by not doing string-splitting on unquoted args by default.
+    # See https://zsh.sourceforge.io/Guide/zshguide05.html section 5.4.4.
+    # Tell it to emulate Bourne shell for this function.
+    if [ -n "$ZSH_VERSION" ]; then emulate -L sh; fi
+
     # Look for the --run-soong-tests flag and skip passing --skip-soong-tests to Soong if present
     local bazel_args=""
     local skip_tests="--skip-soong-tests"
@@ -1883,14 +1888,7 @@ function b()
         fi
 
         # Call Bazel.
-        if [ -n "$ZSH_VERSION" ]; then
-            # zsh breaks posix by not doing string-splitting on unquoted args
-            # by default. Explicitly use the "=" flag to split.
-            # See https://zsh.sourceforge.io/Guide/zshguide05.html section 5.4.4.
-            bazel ${=bazel_args_with_config}
-        else
-            bazel ${bazel_args_with_config[@]}
-        fi
+        bazel ${bazel_args_with_config[@]}
     fi
 )
 
diff --git a/tests/b_tests.sh b/tests/b_tests.sh
index 87d092fa9c..6bc6519985 100755
--- a/tests/b_tests.sh
+++ b/tests/b_tests.sh
@@ -20,12 +20,9 @@ source $(dirname $0)/../envsetup.sh
 
 test_target=//build/bazel/scripts/difftool:difftool
 
-b cquery 'kind(test, //build/bazel/...)'
 b build "$test_target"
 b build "$test_target" --run-soong-tests
 b build --run-soong-tests "$test_target"
 b --run-soong-tests build "$test_target"
-b run $test_target
-b run $test_target -- --help
-b cquery --output=build 'kind(test, //build/bazel/...)'
-b cquery 'kind(test, //build/bazel/...)' --output=build
+b cquery 'kind(test, //build/bazel/examples/android_app/...)' --config=android
+b run $test_target -- --help >/dev/null
diff --git a/tests/roboleaf_tests.sh b/tests/roboleaf_tests.sh
index a411949f15..9e06e9c202 100755
--- a/tests/roboleaf_tests.sh
+++ b/tests/roboleaf_tests.sh
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-exit 0 #TODO(b/244771600) remove this after CI is enabled
-
 tests=(
  $(dirname $0)/b_tests.sh
 )