2 files changed, 18 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
index 16609cac3a..1ba9523665 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
@@ -309,31 +309,37 @@ public class ExperimentalEventHandler implements EventHandler {
   }
 
   @Subscribe
-  public synchronized void buildComplete(BuildCompleteEvent event) {
+  public void buildComplete(BuildCompleteEvent event) {
     // The final progress bar will flow into the scroll-back buffer, to if treat
     // it as an event and add a time stamp, if events are supposed to have a time stmap.
-    if (showTimestamp) {
-      stateTracker.buildComplete(event, TIMESTAMP_FORMAT.print(clock.currentTimeMillis()));
-    } else {
-      stateTracker.buildComplete(event);
+    synchronized (this) {
+      if (showTimestamp) {
+        stateTracker.buildComplete(event, TIMESTAMP_FORMAT.print(clock.currentTimeMillis()));
+      } else {
+        stateTracker.buildComplete(event);
+      }
+      ignoreRefreshLimitOnce();
+      refresh();
+      buildComplete = true;
     }
-    ignoreRefreshLimitOnce();
-    refresh();
-    buildComplete = true;
     stopUpdateThread();
     flushStdOutStdErrBuffers();
   }
 
   @Subscribe
-  public synchronized void noBuild(NoBuildEvent event) {
-    buildComplete = true;
+  public void noBuild(NoBuildEvent event) {
+    synchronized (this) {
+      buildComplete = true;
+    }
     stopUpdateThread();
     flushStdOutStdErrBuffers();
   }
 
   @Subscribe
-  public synchronized void afterCommand(AfterCommandEvent event) {
-    buildComplete = true;
+  public void afterCommand(AfterCommandEvent event) {
+    synchronized (this) {
+      buildComplete = true;
+    }
     stopUpdateThread();
   }
 
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 9224c469aa..35958d4ce7 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -36,7 +36,6 @@ sh_test(
     srcs = ["experimental_ui_test.sh"],
     data = [":test-deps"],
     shard_count = 6,
-    tags = ["manual"],
 )
 
 sh_test(