diff --git a/src/test/shell/integration/client_sigint_test.sh b/src/test/shell/integration/client_sigint_test.sh
index 6e90c49473a6cc..4f6f147a552f05 100755
--- a/src/test/shell/integration/client_sigint_test.sh
+++ b/src/test/shell/integration/client_sigint_test.sh
@@ -45,8 +45,7 @@ EOF
   mkfifo $testfifo $sleepyfifo || fail "Couldn't create FIFOs under x"
 
   set -m
-  # TODO(b/37617303): make test UI-independent
-  bazel $startup_opt build --noexperimental_ui \
+  bazel $startup_opt build --experimental_ui_debug_all_events \
       --package_path . //x:sleepy >& $TEST_log &
   local pid=$!
 
diff --git a/src/test/shell/integration/discard_analysis_cache_test.sh b/src/test/shell/integration/discard_analysis_cache_test.sh
index a0663102113db9..02f7f5c44ee7a2 100755
--- a/src/test/shell/integration/discard_analysis_cache_test.sh
+++ b/src/test/shell/integration/discard_analysis_cache_test.sh
@@ -80,18 +80,18 @@ EOF
 
 function test_compile_helloworld() {
   write_hello_world_files
-  bazel run --noexperimental_ui --discard_analysis_cache hello:hello >&$TEST_log \
+  bazel run --experimental_ui_debug_all_events --discard_analysis_cache hello:hello >&$TEST_log \
       || fail "Build failed"
   expect_log "Loading package: hello"
   expect_log 'hello!'
 
-  bazel run --noexperimental_ui --discard_analysis_cache hello:hello >&$TEST_log \
+  bazel run --experimental_ui_debug_all_events --discard_analysis_cache hello:hello >&$TEST_log \
       || fail "Build failed"
   expect_not_log "Loading package: hello"
   expect_log 'hello!'
 
   # Check that further incremental builds work fine.
-  bazel run --noexperimental_ui hello:hello >&$TEST_log \
+  bazel run --experimental_ui_debug_all_events hello:hello >&$TEST_log \
       || fail "Build failed"
   expect_not_log "Loading package: hello"
   expect_log 'hello!'
diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index ec7c43dcbe9447..1895eee11b4972 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -425,7 +425,7 @@ function test_dump_after_discard_incrementality_data() {
 function test_query_after_discard_incrementality_data() {
   bazel build --nobuild --notrack_incremental_state //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
-  bazel query --noexperimental_ui --output=label_kind //testing:mytest \
+  bazel query --experimental_ui_debug_all_events --output=label_kind //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
   expect_log "cc_test rule //testing:mytest"
@@ -452,19 +452,19 @@ function test_switch_back_and_forth() {
   readonly local server_pid="$(bazel info \
       --notrack_incremental_state server_pid 2> /dev/null)"
   [[ -z "$server_pid" ]] && fail "Couldn't get server pid"
-  bazel test --noexperimental_ui --notrack_incremental_state \
+  bazel test --experimental_ui_debug_all_events --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
-  bazel test --noexperimental_ui --notrack_incremental_state \
+  bazel test --experimental_ui_debug_all_events --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
-  bazel test --noexperimental_ui //testing:mytest >& "$TEST_log" \
+  bazel test --experimental_ui_debug_all_events //testing:mytest >& "$TEST_log" \
       || fail "Expected success"
   expect_log "Loading package: testing"
-  bazel test --noexperimental_ui //testing:mytest >& "$TEST_log" \
+  bazel test --experimental_ui_debug_all_events //testing:mytest >& "$TEST_log" \
       || fail "Expected success"
   expect_not_log "Loading package: testing"
-  bazel test --noexperimental_ui --notrack_incremental_state \
+  bazel test --experimental_ui_debug_all_events --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
   readonly local new_server_pid="$(bazel info server_pid 2> /dev/null)"