diff --git a/.github/workflows/icon4py-qa.yml b/.github/workflows/icon4py-qa.yml
index 81584064ff..e0e1a06f00 100644
--- a/.github/workflows/icon4py-qa.yml
+++ b/.github/workflows/icon4py-qa.yml
@@ -1,6 +1,7 @@
 name: ICON4Py Quality Assurance
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -9,6 +10,9 @@ on:
     pull_request:
         branches:
             - main
+        types: [opened, reopened, assigned, ready_for_review]
+    pull_request_review:
+        types: [submitted, edited]
 
 jobs:
     pre-commit:
diff --git a/.github/workflows/icon4py-tox.yml b/.github/workflows/icon4py-tox.yml
index f39655c350..8d57d12eb9 100644
--- a/.github/workflows/icon4py-tox.yml
+++ b/.github/workflows/icon4py-tox.yml
@@ -1,6 +1,7 @@
 name: ICON4Py Tox
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -9,7 +10,9 @@ on:
     pull_request:
         branches:
             - main
-
+        types: [opened, reopened, assigned, ready_for_review]
+    pull_request_review:
+        types: [submitted, edited]
 jobs:
     tox-tests:
         runs-on: ubuntu-latest
diff --git a/.github/workflows/icon4pytools-qa.yml b/.github/workflows/icon4pytools-qa.yml
index f82deb0295..3539d285c8 100644
--- a/.github/workflows/icon4pytools-qa.yml
+++ b/.github/workflows/icon4pytools-qa.yml
@@ -1,6 +1,7 @@
 name: ICON4PyTools Quality Assurance
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -10,6 +11,9 @@ on:
     pull_request:
         branches:
             - main
+        types: [opened, reopened, assigned, ready_for_review]
+    pull_request_review:
+        types: [submitted, edited]
 
 jobs:
     pre-commit:
diff --git a/.github/workflows/icon4pytools-tox.yml b/.github/workflows/icon4pytools-tox.yml
index 2b68e80181..97831426c8 100644
--- a/.github/workflows/icon4pytools-tox.yml
+++ b/.github/workflows/icon4pytools-tox.yml
@@ -1,6 +1,7 @@
 name: ICON4PyTools Tox
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -10,6 +11,9 @@ on:
     pull_request:
         branches:
             - main
+        types: [opened, reopened, assigned, ready_for_review]
+    pull_request_review:
+        types: [submitted, edited]
 
 jobs:
     tox-tests:
diff --git a/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_20.py b/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_20.py
index 9ec1320cd0..72b6d1656a 100644
--- a/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_20.py
+++ b/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_20.py
@@ -101,11 +101,6 @@ def test_mo_solve_nonhydro_stencil_20():
         np.asarray(z_dexner_dz_c_2),
     )
 
-    hstart = 0
-    hend = mesh.n_edges
-    kstart = 0
-    kend = mesh.k_level
-
     mo_solve_nonhydro_stencil_20(
         inv_dual_edge_length,
         z_exner_ex_pr,
@@ -114,10 +109,6 @@ def test_mo_solve_nonhydro_stencil_20():
         z_dexner_dz_c_1,
         z_dexner_dz_c_2,
         z_gradh_exner,
-        hstart,
-        hend,
-        kstart,
-        kend,
         offset_provider={
             "E2C": mesh.get_e2c_offset_provider(),
             "E2EC": StridedNeighborOffsetProvider(EdgeDim, ECDim, mesh.n_e2c),
diff --git a/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_21.py b/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_21.py
index cf2d4ee3d9..9752b27919 100644
--- a/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_21.py
+++ b/atm_dyn_iconam/tests/test_mo_solve_nonhydro_stencil_21.py
@@ -123,11 +123,6 @@ def test_mo_solve_nonhydro_stencil_21():
         grav_o_cpd,
     )
 
-    hstart = 0
-    hend = mesh.n_edges
-    kstart = 0
-    kend = mesh.k_level
-
     mo_solve_nonhydro_stencil_21(
         theta_v,
         ikoffset_new,
@@ -137,10 +132,6 @@ def test_mo_solve_nonhydro_stencil_21():
         inv_dual_edge_length,
         grav_o_cpd,
         z_hydro_corr,
-        hstart,
-        hend,
-        kstart,
-        kend,
         offset_provider={
             "E2C": mesh.get_e2c_offset_provider(),
             "E2EC": StridedNeighborOffsetProvider(EdgeDim, ECDim, mesh.n_e2c),
diff --git a/atm_dyn_iconam/tests/test_truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py b/atm_dyn_iconam/tests/test_truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py
index 28ee4fff36..925e04d555 100644
--- a/atm_dyn_iconam/tests/test_truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py
+++ b/atm_dyn_iconam/tests/test_truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py
@@ -106,11 +106,6 @@ def test_mo_nh_diffusion_stencil_15():
         np.asarray(z_temp),
     )
 
-    hstart = 0
-    hend = mesh.n_cells
-    kstart = 0
-    kend = mesh.k_level
-
     truly_horizontal_diffusion_nabla_of_theta_over_steep_points(
         mask,
         zd_vertoffset_new,
@@ -120,10 +115,6 @@ def test_mo_nh_diffusion_stencil_15():
         vcoef_new,
         theta_v,
         z_temp,
-        hstart,
-        hend,
-        kstart,
-        kend,
         offset_provider={
             "C2E2C": mesh.get_c2e2c_offset_provider(),
             "C2CEC": StridedNeighborOffsetProvider(CellDim, CECDim, mesh.n_c2e2c),