diff --git a/src/intel/compiler/brw/brw_lower_scoreboard.cpp b/src/intel/compiler/brw/brw_lower_scoreboard.cpp
index db0742cab88..903147fc0cd 100644
--- a/src/intel/compiler/brw/brw_lower_scoreboard.cpp
+++ b/src/intel/compiler/brw/brw_lower_scoreboard.cpp
@@ -950,7 +950,8 @@ namespace {
                                  const std::vector<dependency> &deps,
                                  const ordered_address &jp)
    {
-      const bool exec_all = inst->force_writemask_all;
+      const bool exec_all = inst->force_writemask_all ||
+                            !needs_nomask_workaround(devinfo);
       const bool has_ordered = find_ordered_dependency(deps, jp, exec_all);
       const tgl_pipe ordered_pipe = ordered_dependency_swsb(deps, jp,
                                                             exec_all).pipe;
diff --git a/src/intel/compiler/brw/test_lower_scoreboard.cpp b/src/intel/compiler/brw/test_lower_scoreboard.cpp
index 22d9a60e321..eaaf4199ca6 100644
--- a/src/intel/compiler/brw/test_lower_scoreboard.cpp
+++ b/src/intel/compiler/brw/test_lower_scoreboard.cpp
@@ -1125,8 +1125,7 @@ TEST_F(scoreboard_test, scalar_register_mov_immediate_is_in_scalar_pipe)
    EXPECT_PROGRESS(brw_lower_scoreboard, bld);
 
    exp.uniform().MOV(scalar, imm);
-                 SYNC_NOP(exp   )->sched = SWSB("S@1");
-   exp          .MOV(r20, scalar);
+   exp          .MOV(r20, scalar)->sched = SWSB("S@1");
 
    EXPECT_SHADERS_MATCH(bld, exp);
 }
@@ -1148,8 +1147,7 @@ TEST_F(scoreboard_test, scalar_register_mov_grf_is_not_in_scalar_pipe)
    EXPECT_PROGRESS(brw_lower_scoreboard, bld);
 
    exp.uniform().MOV     (scalar, r10);
-                 SYNC_NOP(exp       )->sched = SWSB("I@1");
-   exp          .MOV     (r20, scalar);
+   exp          .MOV     (r20, scalar)->sched = SWSB("I@1");
 
    EXPECT_SHADERS_MATCH(bld, exp);
 }
@@ -1287,7 +1285,7 @@ TEST_F(scoreboard_test, implicit_dependency_inside_if)
    EXPECT_SHADERS_MATCH(bld, exp);
 }
 
-TEST_F(scoreboard_test, DISABLED_xe2_uniform_writer_baked_into_masked_consumer)
+TEST_F(scoreboard_test, xe2_uniform_writer_baked_into_masked_consumer)
 {
    set_gfx_verx10(200);
 
@@ -1308,7 +1306,7 @@ TEST_F(scoreboard_test, DISABLED_xe2_uniform_writer_baked_into_masked_consumer)
    EXPECT_SHADERS_MATCH(bld, exp);
 }
 
-TEST_F(scoreboard_test, DISABLED_xe2_uniform_writer_baked_into_masked_send)
+TEST_F(scoreboard_test, xe2_uniform_writer_baked_into_masked_send)
 {
    set_gfx_verx10(200);