diff --git a/flang/test/OmpSs-RT/lit.local.cfg b/flang/test/OmpSs-RT/lit.local.cfg
index 669aa52f3ff9..19abb43c1b3c 100644
--- a/flang/test/OmpSs-RT/lit.local.cfg
+++ b/flang/test/OmpSs-RT/lit.local.cfg
@@ -9,7 +9,7 @@ local_config.append(("%oss-mod-compile-and-run", \
 
 # Insert before already defined match substitution
 local_config.append(("%oss-compile", \
-	"%flang -fompss-2 %s -o %t"))
+	"%flang -flang-deprecated-no-hlfir -fompss-2 %s -o %t"))
 
 local_config.append(("%oss-run", "%t"))
 
diff --git a/flang/test/OmpSs/Lower/FIR/associate.f90 b/flang/test/OmpSs/Lower/FIR/associate.f90
index c518e3dcdbae..67157a16e318 100644
--- a/flang/test/OmpSs/Lower/FIR/associate.f90
+++ b/flang/test/OmpSs/Lower/FIR/associate.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM S
   IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90 b/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90
index 5c52feb5d6d7..327c7ed83d7a 100644
--- a/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90
+++ b/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90
@@ -3,7 +3,7 @@
 ! In this case STOP must have the OmpSsConstruct as a lexicalSuccessor
 ! to marks it as a start new block evaluation.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/FIR/copyinout.f90 b/flang/test/OmpSs/Lower/FIR/copyinout.f90
index 73c8b4d368b0..b1a3f8bd8218 100644
--- a/flang/test/OmpSs/Lower/FIR/copyinout.f90
+++ b/flang/test/OmpSs/Lower/FIR/copyinout.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 subroutine test_intent_in(x)
   real :: x(:)
   call bar_intent_in(x)
diff --git a/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90 b/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90
index 4dd1575f1445..b7272370bd81 100644
--- a/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90
+++ b/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test test checks we do not emit duplicates data-sharings
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I, J, K
diff --git a/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90 b/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90
index 50970377f78e..e2d4cb8a9f30 100644
--- a/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90
+++ b/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test test checks we do not emit duplicates data-sharings
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I, J, K, U
diff --git a/flang/test/OmpSs/Lower/FIR/mod-use.f90 b/flang/test/OmpSs/Lower/FIR/mod-use.f90
index 54887548f148..90c7c68f15cb 100644
--- a/flang/test/OmpSs/Lower/FIR/mod-use.f90
+++ b/flang/test/OmpSs/Lower/FIR/mod-use.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 module mod
   implicit none
diff --git a/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90 b/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90
index 58c4d2554f02..8ac3efbb25a1 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 ! - [x] assumed-shape
 ! - [x] deferred-shape
diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90
index b6ebe3aa72bc..86d355a29ea2 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90
@@ -1,6 +1,6 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 deps.
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 ! Assumed-shape
 
diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90
index 76b07a3bce4f..c0084945b3e9 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90
@@ -3,7 +3,7 @@
 
 ! explicit-shape non constant shape
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
   IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep.f90
index 9250c170d3d4..088893f4171d 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-dep.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-dep.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 ! Support list
diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep01.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep01.f90
index b0e66ec292a9..6ea1adbbe9f6 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-dep01.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-dep01.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 ! Support list
diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep02.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep02.f90
index 3ca1cf9e9949..eb0094ba01b0 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-dep02.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-dep02.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp for multidimensional arrays.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program task
diff --git a/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90 b/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90
index a2aa5998bc7b..1efe82e6f56d 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 like dependencies.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90 b/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90
index c9c77cf260b5..652d5edc63b4 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 loop Directives.
 ! All induction variables inside the construct are private
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 subroutine task()
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90
index 88298d286cb1..5852df7f93ee 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 MODULE M
diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90
index 7fdf425fd78f..13221d2db084 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 MODULE M
diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90
index 38585888fa3f..b4eceacd1d1e 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 DepOp
 ! derived type (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 MODULE M
     TYPE TY
diff --git a/flang/test/OmpSs/Lower/FIR/oss-release.f90 b/flang/test/OmpSs/Lower/FIR/oss-release.f90
index 20ad80bee1b9..dcce2dc81874 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-release.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-release.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program release
diff --git a/flang/test/OmpSs/Lower/FIR/oss-task-for.f90 b/flang/test/OmpSs/Lower/FIR/oss-task-for.f90
index 63b4ad9968c0..b1603fb78b63 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-task-for.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-task-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 task do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/FIR/oss-task.f90 b/flang/test/OmpSs/Lower/FIR/oss-task.f90
index 485f72bcce82..69efa56d12ec 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-task.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-task.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 task Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program task
diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90
index 3dba86366915..c94a8f4b1510 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90
index 7220dea05faf..0bcbddc783ba 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90
index 13a894a0200d..730274961675 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskwait Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program taskwait
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/FIR/oss-vla.f90 b/flang/test/OmpSs/Lower/FIR/oss-vla.f90
index e923a879edc0..370d92d89911 100644
--- a/flang/test/OmpSs/Lower/FIR/oss-vla.f90
+++ b/flang/test/OmpSs/Lower/FIR/oss-vla.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 subroutine task(X)
diff --git a/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90 b/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90
index 9bf90c03d53b..bd2f2cf6b2d0 100644
--- a/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90
+++ b/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 !$OSS TASK INOUT(X)
 SUBROUTINE S1(X)
diff --git a/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90 b/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90
index d8942996be36..900cca7e3b8a 100644
--- a/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90
+++ b/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 !$OSS TASK OUT(X)
 SUBROUTINE S1(X)
diff --git a/flang/test/OmpSs/Lower/FIR/stmt-function.f90 b/flang/test/OmpSs/Lower/FIR/stmt-function.f90
index 5a44283b40c6..104aa9233493 100644
--- a/flang/test/OmpSs/Lower/FIR/stmt-function.f90
+++ b/flang/test/OmpSs/Lower/FIR/stmt-function.f90
@@ -5,7 +5,7 @@
 ! It seems that N and M are not in the SymMap and we cannot bind
 ! them with our task symbol
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 SUBROUTINE FOO(N, M)
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/FIR/test-task-call.f90 b/flang/test/OmpSs/Lower/FIR/test-task-call.f90
index 278b665cf7da..acd89d3c707b 100644
--- a/flang/test/OmpSs/Lower/FIR/test-task-call.f90
+++ b/flang/test/OmpSs/Lower/FIR/test-task-call.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 MODULE MOO
 CONTAINS
diff --git a/flang/test/OmpSs/Lower/FIR/toutline01.f90 b/flang/test/OmpSs/Lower/FIR/toutline01.f90
index c406b67efd7d..139337c590cb 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline01.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline01.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/array-constructor-2.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/toutline02.f90 b/flang/test/OmpSs/Lower/FIR/toutline02.f90
index 384a806ead3a..a24b6e9348a4 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline02.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline02.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/call-by-value.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/toutline03.f90 b/flang/test/OmpSs/Lower/FIR/toutline03.f90
index 95de9e350d6b..0ac047616219 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline03.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline03.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/dummy-argument-assumed-shape-optional.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/toutline04.f90 b/flang/test/OmpSs/Lower/FIR/toutline04.f90
index 5810e592657c..502f59f63f6c 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline04.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline04.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s
 
 ! Based on Lower/dummy-argument-optional.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/toutline05.f90 b/flang/test/OmpSs/Lower/FIR/toutline05.f90
index 9efeb7f64dd6..1a82e70bdf18 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline05.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline05.f90
@@ -1,6 +1,6 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test calls with POINTER dummy arguments on the caller side.
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s
 
 ! Based on Lower/pointer-args-caller.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/toutline06.f90 b/flang/test/OmpSs/Lower/FIR/toutline06.f90
index 00a17c9865fb..43cead6a51e9 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline06.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline06.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -polymorphic-type -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -polymorphic-type -emit-fir %s -o - | FileCheck %s
 ! XFAIL: true
 ! NOTE: Fow now let's wait until merge upstream to see what we can do to
 ! support this
diff --git a/flang/test/OmpSs/Lower/FIR/toutline07.f90 b/flang/test/OmpSs/Lower/FIR/toutline07.f90
index aac0d6e4a4be..ff3e40dddaa4 100644
--- a/flang/test/OmpSs/Lower/FIR/toutline07.f90
+++ b/flang/test/OmpSs/Lower/FIR/toutline07.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir %s -o - | FileCheck %s
 
 ! Borrowed from Lower/call-copy-in-out.f90
 
diff --git a/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90 b/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90
index a53db1b73f6b..2f7f833bd772 100644
--- a/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90
+++ b/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
diff --git a/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90 b/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90
index 42773b7933b8..f2f0191b80c9 100644
--- a/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90
+++ b/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
diff --git a/flang/test/OmpSs/Lower/HLFIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIR/oss-task.f90
index 3a85e7795bb1..7b22c1245ee6 100644
--- a/flang/test/OmpSs/Lower/HLFIR/oss-task.f90
+++ b/flang/test/OmpSs/Lower/HLFIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-hlfir %s -o - | FileCheck %s --check-prefix=HLFIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-hlfir %s -o - | FileCheck %s --check-prefix=HLFIRDialect
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X
diff --git a/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90
index 7d4340d204d5..b4e824f21108 100644
--- a/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90
+++ b/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | FileCheck %s --check-prefix=HLFIRToFIR
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | FileCheck %s --check-prefix=HLFIRToFIR
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X
diff --git a/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90
index 0a1d9bc39ce2..ad756a198964 100644
--- a/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90
+++ b/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir -o - 2>&1 | FileCheck %s --check-prefix=HLFIRToLLVMDialect
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir -o - 2>&1 | FileCheck %s --check-prefix=HLFIRToLLVMDialect
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X
diff --git a/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90
index 099e1fe1a393..5a0b7c61daa5 100644
--- a/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90
+++ b/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | tco | FileCheck %s --check-prefix=HLFIRToLLVMIR
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | tco | FileCheck %s --check-prefix=HLFIRToLLVMIR
 
 ! Here we check we eliminate HLFIR generated duplicates
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/associate.f90 b/flang/test/OmpSs/Lower/LLVMDialect/associate.f90
index fd8ba64b6bcf..faeeb3d2243f 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/associate.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/associate.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
 
 PROGRAM S
   IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90 b/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90
index 53d5424136b0..1e81abeb53b8 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
 
 PROGRAM P
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90 b/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90
index b8add57cd51c..55abe8968de1 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90
@@ -1,7 +1,7 @@
 ! This test Canonicalize does not perform optimizations between values
 ! that are defined outside the task and used inside.
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --canonicalize 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90 b/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90
index e4ccf83d1000..2f74d6e150f2 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90
@@ -1,7 +1,7 @@
 ! This test CSE (mlir) does not perform optimizations between values
 ! that are defined outside the task and used inside.
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cse 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90
index d70792fd85c6..3005cb415d58 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90
@@ -3,7 +3,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 ! Support list
 ! - [x] scalar
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90
index 9607f7372540..4689102cf950 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90
@@ -3,7 +3,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 ! Support list
 ! - [x] assumed-size array
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90
index 28bf45aff7d6..f937d9eb1387 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 like dependencies.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90
index 9d1dfd070a52..383b1a5c1928 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 loop Directives.
 ! All induction variables inside the construct are private
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 subroutine task()
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-release.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-release.f90
index da43bd5c26e6..204d1ac33aff 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-release.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-release.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-task-for.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-task-for.f90
index 1c53feff5dcc..8e483900aa7a 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-task-for.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-task-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 task do Directive.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-task.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-task.f90
index 4308c43c4a22..c77f7cc9c373 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-task.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-task.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 task Directive.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop-for.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop-for.f90
index ecb8090b4ee4..50c79fce1e60 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop-for.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop do Directive.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop.f90
index 20f3e57a8c34..ee2d3d025143 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-taskloop.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop Directive.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     INTEGER :: I
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-vla.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-vla.f90
index 05496a2c6b8f..903b867ee299 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/oss-vla.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/oss-vla.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body01.f90 b/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body01.f90
index 833b3c8423bc..ff2ea70c08f6 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body01.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body01.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body02.f90 b/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body02.f90
index 551b717b0871..e81e24f8b74e 100644
--- a/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body02.f90
+++ b/flang/test/OmpSs/Lower/LLVMDialect/unstructured-body02.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 
diff --git a/flang/test/OmpSs/Lower/LLVMIR/associate.f90 b/flang/test/OmpSs/Lower/LLVMIR/associate.f90
index c259831fc28a..f8d8be30575d 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/associate.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/associate.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | tco | FileCheck %s --check-prefix=LLVMIR
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | tco | FileCheck %s --check-prefix=LLVMIR
 
 PROGRAM S
   IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/LLVMIR/bug_directive_lexsuc.f90 b/flang/test/OmpSs/Lower/LLVMIR/bug_directive_lexsuc.f90
index 7b3229e127c9..e19c6a75025c 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/bug_directive_lexsuc.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/bug_directive_lexsuc.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | tco | FileCheck %s --check-prefix=LLVMIR
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | tco | FileCheck %s --check-prefix=LLVMIR
 
 PROGRAM P
     IMPLICIT NONE
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-dep.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-dep.f90
index a84a642fd708..bcbe607e4847 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-dep.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-dep.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 ! Support list
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-dep01.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-dep01.f90
index 438121fd32ef..2f078cba6b58 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-dep01.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-dep01.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 ! Support list
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-like-dep.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-like-dep.f90
index 7c059618c778..0406d7fb7d4d 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-like-dep.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-like-dep.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 like dependencies.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program task
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-loop-nested-do.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-loop-nested-do.f90
index df27622a4a0c..54ce918cfea3 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-loop-nested-do.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-loop-nested-do.f90
@@ -1,7 +1,7 @@
 ! This test checks lowering of OmpSs-2 loop Directives.
 ! All induction variables inside the construct are private
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 subroutine task()
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-release.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-release.f90
index c20552efd233..0a6be500e5e5 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-release.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-release.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program release
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-task-for.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-task-for.f90
index cbae66d99281..590442674a76 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-task-for.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-task-for.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 task do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program task
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-task.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-task.f90
index 8c5afabfd14b..4e872b14bd41 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-task.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-task.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 task Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program task
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop-for.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop-for.f90
index 024d389b4df2..42245e18ecd0 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop-for.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop-for.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 taskloop do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program task
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop.f90
index f9fc60709dd3..ea7d88ecdba2 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-taskloop.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 taskloop Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 program task
diff --git a/flang/test/OmpSs/Lower/LLVMIR/oss-vla.f90 b/flang/test/OmpSs/Lower/LLVMIR/oss-vla.f90
index 2c9bf4ca11f0..9bf96cfa12c6 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/oss-vla.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/oss-vla.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 subroutine task(X)
diff --git a/flang/test/OmpSs/Lower/LLVMIR/unstructured-body01.f90 b/flang/test/OmpSs/Lower/LLVMIR/unstructured-body01.f90
index 10d0daa6504a..fd9cd7effcef 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/unstructured-body01.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/unstructured-body01.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 PROGRAM P
diff --git a/flang/test/OmpSs/Lower/LLVMIR/unstructured-body02.f90 b/flang/test/OmpSs/Lower/LLVMIR/unstructured-body02.f90
index 8e70620c25a2..4db745d6c64c 100644
--- a/flang/test/OmpSs/Lower/LLVMIR/unstructured-body02.f90
+++ b/flang/test/OmpSs/Lower/LLVMIR/unstructured-body02.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   tco | FileCheck %s --check-prefix=LLVMIR
 
 PROGRAM P
diff --git a/flang/test/OmpSs/Lower/pre-fir-tree01.f90 b/flang/test/OmpSs/Lower/pre-fir-tree01.f90
index f0541498736a..634a78d11dea 100644
--- a/flang/test/OmpSs/Lower/pre-fir-tree01.f90
+++ b/flang/test/OmpSs/Lower/pre-fir-tree01.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -pft-test -fompss-2 -o %t %s | FileCheck %s
+! RUN: bbc -hlfir=false -pft-test -fompss-2 -o %t %s | FileCheck %s
 
 ! Test Pre-FIR Tree captures OmpSs-2 related constructs