diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index aa14faed29..008fe82d7d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -106,7 +106,7 @@ steps:
         artifact_paths: "Output.Bomex.01_NN/stats/comparison/*"
 
       - label: ":partly_sunny: Bomex with FNO"
-        command: "julia --color=yes --project=integration_tests integration_tests/driver.jl --case Bomex --entr FNO --skip_tests true --suffix _FNO"
+        command: "julia --color=yes --project=integration_tests integration_tests/driver.jl --case Bomex --entr FNO --skip_tests true --broken_tests true --suffix _FNO"
         artifact_paths: "Output.Bomex.01_FNO/stats/comparison/*"
 
       - label: ":partly_sunny: Bomex with RF"
diff --git a/integration_tests/cli_options.jl b/integration_tests/cli_options.jl
index 57a99f64bb..18578dd00e 100644
--- a/integration_tests/cli_options.jl
+++ b/integration_tests/cli_options.jl
@@ -34,6 +34,9 @@ function parse_commandline()
         "--skip_tests"     # Skip regression tests
         arg_type = Bool
         default = false
+        "--broken_tests"     # Tests are broken, skip tests
+        arg_type = Bool
+        default = false
         "--suffix"         # A suffix for the artifact folder
         arg_type = String
         default = ""
diff --git a/integration_tests/driver.jl b/integration_tests/driver.jl
index cb98737be3..da59172567 100644
--- a/integration_tests/driver.jl
+++ b/integration_tests/driver.jl
@@ -49,6 +49,7 @@ no_overwrites = (
     "case", # default_namelist already overwrites namelist["meta"]["casename"]
     "skip_post_proc",
     "skip_tests",
+    "broken_tests",
     "trunc_field_type_print",
     "suffix",
 )
@@ -82,6 +83,15 @@ end
 
 ds_tc_filename, return_code = main(namelist)
 
+parsed_args["broken_tests"] && exit()
+
+@testset "Simulation completion" begin
+    # Test that the simulation has actually finished,
+    # and not aborted early.
+    @test !(return_code == :simulation_aborted)
+    @test return_code == :success
+end
+
 # Post-processing case kwargs
 include(joinpath(tc_dir, "post_processing", "case_kwargs.jl"))
 include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
@@ -124,13 +134,6 @@ end
         end
         nothing
     end
-
-    @testset "Simulation completion" begin
-        # Test that the simulation has actually finished,
-        # and not aborted early.
-        @test !(return_code == :simulation_aborted)
-        @test return_code == :success
-    end
     nothing
 end