diff --git a/flang/test/Lower/OpenMP/array-bounds.f90 b/flang/test/Lower/OpenMP/FIR/array-bounds.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/array-bounds.f90
rename to flang/test/Lower/OpenMP/FIR/array-bounds.f90
diff --git a/flang/test/Lower/OpenMP/atomic-capture.f90 b/flang/test/Lower/OpenMP/FIR/atomic-capture.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/atomic-capture.f90
rename to flang/test/Lower/OpenMP/FIR/atomic-capture.f90
diff --git a/flang/test/Lower/OpenMP/atomic-read.f90 b/flang/test/Lower/OpenMP/FIR/atomic-read.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/atomic-read.f90
rename to flang/test/Lower/OpenMP/FIR/atomic-read.f90
diff --git a/flang/test/Lower/OpenMP/atomic-update.f90 b/flang/test/Lower/OpenMP/FIR/atomic-update.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/atomic-update.f90
rename to flang/test/Lower/OpenMP/FIR/atomic-update.f90
diff --git a/flang/test/Lower/OpenMP/atomic-write.f90 b/flang/test/Lower/OpenMP/FIR/atomic-write.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/atomic-write.f90
rename to flang/test/Lower/OpenMP/FIR/atomic-write.f90
diff --git a/flang/test/Lower/OpenMP/copyin.f90 b/flang/test/Lower/OpenMP/FIR/copyin.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/copyin.f90
rename to flang/test/Lower/OpenMP/FIR/copyin.f90
diff --git a/flang/test/Lower/OpenMP/critical.f90 b/flang/test/Lower/OpenMP/FIR/critical.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/critical.f90
rename to flang/test/Lower/OpenMP/FIR/critical.f90
diff --git a/flang/test/Lower/OpenMP/declare-target-data.f90 b/flang/test/Lower/OpenMP/FIR/declare-target-data.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/declare-target-data.f90
rename to flang/test/Lower/OpenMP/FIR/declare-target-data.f90
diff --git a/flang/test/Lower/OpenMP/declare-target-func-and-subr.f90 b/flang/test/Lower/OpenMP/FIR/declare-target-func-and-subr.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/declare-target-func-and-subr.f90
rename to flang/test/Lower/OpenMP/FIR/declare-target-func-and-subr.f90
diff --git a/flang/test/Lower/OpenMP/declare-target-implicit-func-and-subr-cap.f90 b/flang/test/Lower/OpenMP/FIR/declare-target-implicit-func-and-subr-cap.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/declare-target-implicit-func-and-subr-cap.f90
rename to flang/test/Lower/OpenMP/FIR/declare-target-implicit-func-and-subr-cap.f90
diff --git a/flang/test/Lower/OpenMP/declare-target-implicit-tarop-cap.f90 b/flang/test/Lower/OpenMP/FIR/declare-target-implicit-tarop-cap.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/declare-target-implicit-tarop-cap.f90
rename to flang/test/Lower/OpenMP/FIR/declare-target-implicit-tarop-cap.f90
diff --git a/flang/test/Lower/OpenMP/default-clause.f90 b/flang/test/Lower/OpenMP/FIR/default-clause.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/default-clause.f90
rename to flang/test/Lower/OpenMP/FIR/default-clause.f90
diff --git a/flang/test/Lower/OpenMP/firstprivate-commonblock.f90 b/flang/test/Lower/OpenMP/FIR/firstprivate-commonblock.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/firstprivate-commonblock.f90
rename to flang/test/Lower/OpenMP/FIR/firstprivate-commonblock.f90
diff --git a/flang/test/Lower/OpenMP/flush.f90 b/flang/test/Lower/OpenMP/FIR/flush.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/flush.f90
rename to flang/test/Lower/OpenMP/FIR/flush.f90
diff --git a/flang/test/Lower/OpenMP/function-filtering-2.f90 b/flang/test/Lower/OpenMP/FIR/function-filtering-2.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/function-filtering-2.f90
rename to flang/test/Lower/OpenMP/FIR/function-filtering-2.f90
diff --git a/flang/test/Lower/OpenMP/function-filtering.f90 b/flang/test/Lower/OpenMP/FIR/function-filtering.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/function-filtering.f90
rename to flang/test/Lower/OpenMP/FIR/function-filtering.f90
diff --git a/flang/test/Lower/OpenMP/host-ir-flag.f90 b/flang/test/Lower/OpenMP/FIR/host-ir-flag.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/host-ir-flag.f90
rename to flang/test/Lower/OpenMP/FIR/host-ir-flag.f90
diff --git a/flang/test/Lower/OpenMP/if-clause.f90 b/flang/test/Lower/OpenMP/FIR/if-clause.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/if-clause.f90
rename to flang/test/Lower/OpenMP/FIR/if-clause.f90
diff --git a/flang/test/Lower/OpenMP/is-device.f90 b/flang/test/Lower/OpenMP/FIR/is-device.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/is-device.f90
rename to flang/test/Lower/OpenMP/FIR/is-device.f90
diff --git a/flang/test/Lower/OpenMP/lastprivate-commonblock.f90 b/flang/test/Lower/OpenMP/FIR/lastprivate-commonblock.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/lastprivate-commonblock.f90
rename to flang/test/Lower/OpenMP/FIR/lastprivate-commonblock.f90
diff --git a/flang/test/Lower/OpenMP/location.f90 b/flang/test/Lower/OpenMP/FIR/location.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/location.f90
rename to flang/test/Lower/OpenMP/FIR/location.f90
diff --git a/flang/test/Lower/OpenMP/loop-combined.f90 b/flang/test/Lower/OpenMP/FIR/loop-combined.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/loop-combined.f90
rename to flang/test/Lower/OpenMP/FIR/loop-combined.f90
diff --git a/flang/test/Lower/OpenMP/master.f90 b/flang/test/Lower/OpenMP/FIR/master.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/master.f90
rename to flang/test/Lower/OpenMP/FIR/master.f90
diff --git a/flang/test/Lower/OpenMP/omp-declare-target-program-var.f90 b/flang/test/Lower/OpenMP/FIR/omp-declare-target-program-var.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-declare-target-program-var.f90
rename to flang/test/Lower/OpenMP/FIR/omp-declare-target-program-var.f90
diff --git a/flang/test/Lower/OpenMP/omp-is-gpu.f90 b/flang/test/Lower/OpenMP/FIR/omp-is-gpu.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-is-gpu.f90
rename to flang/test/Lower/OpenMP/FIR/omp-is-gpu.f90
diff --git a/flang/test/Lower/OpenMP/omp-target-early-outlining.f90 b/flang/test/Lower/OpenMP/FIR/omp-target-early-outlining.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-target-early-outlining.f90
rename to flang/test/Lower/OpenMP/FIR/omp-target-early-outlining.f90
diff --git a/flang/test/Lower/OpenMP/ordered-threads.f90 b/flang/test/Lower/OpenMP/FIR/ordered-threads.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/ordered-threads.f90
rename to flang/test/Lower/OpenMP/FIR/ordered-threads.f90
diff --git a/flang/test/Lower/OpenMP/parallel-firstprivate-clause-scalar.f90 b/flang/test/Lower/OpenMP/FIR/parallel-firstprivate-clause-scalar.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-firstprivate-clause-scalar.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-firstprivate-clause-scalar.f90
diff --git a/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90 b/flang/test/Lower/OpenMP/FIR/parallel-lastprivate-clause-scalar.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-lastprivate-clause-scalar.f90
diff --git a/flang/test/Lower/OpenMP/parallel-private-clause-fixes.f90 b/flang/test/Lower/OpenMP/FIR/parallel-private-clause-fixes.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-private-clause-fixes.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-private-clause-fixes.f90
diff --git a/flang/test/Lower/OpenMP/parallel-private-clause.f90 b/flang/test/Lower/OpenMP/FIR/parallel-private-clause.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-private-clause.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-private-clause.f90
diff --git a/flang/test/Lower/OpenMP/parallel-reduction-add.f90 b/flang/test/Lower/OpenMP/FIR/parallel-reduction-add.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-reduction-add.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-reduction-add.f90
diff --git a/flang/test/Lower/OpenMP/parallel-sections.f90 b/flang/test/Lower/OpenMP/FIR/parallel-sections.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-sections.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-sections.f90
diff --git a/flang/test/Lower/OpenMP/parallel-wsloop-firstpriv.f90 b/flang/test/Lower/OpenMP/FIR/parallel-wsloop-firstpriv.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-wsloop-firstpriv.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-wsloop-firstpriv.f90
diff --git a/flang/test/Lower/OpenMP/parallel-wsloop.f90 b/flang/test/Lower/OpenMP/FIR/parallel-wsloop.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel-wsloop.f90
rename to flang/test/Lower/OpenMP/FIR/parallel-wsloop.f90
diff --git a/flang/test/Lower/OpenMP/parallel.f90 b/flang/test/Lower/OpenMP/FIR/parallel.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/parallel.f90
rename to flang/test/Lower/OpenMP/FIR/parallel.f90
diff --git a/flang/test/Lower/OpenMP/pre-fir-tree-loop.f90 b/flang/test/Lower/OpenMP/FIR/pre-fir-tree-loop.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/pre-fir-tree-loop.f90
rename to flang/test/Lower/OpenMP/FIR/pre-fir-tree-loop.f90
diff --git a/flang/test/Lower/OpenMP/pre-fir-tree01.f90 b/flang/test/Lower/OpenMP/FIR/pre-fir-tree01.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/pre-fir-tree01.f90
rename to flang/test/Lower/OpenMP/FIR/pre-fir-tree01.f90
diff --git a/flang/test/Lower/OpenMP/private-commonblock.f90 b/flang/test/Lower/OpenMP/FIR/private-commonblock.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/private-commonblock.f90
rename to flang/test/Lower/OpenMP/FIR/private-commonblock.f90
diff --git a/flang/test/Lower/OpenMP/requires-common.f90 b/flang/test/Lower/OpenMP/FIR/requires-common.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/requires-common.f90
rename to flang/test/Lower/OpenMP/FIR/requires-common.f90
diff --git a/flang/test/Lower/OpenMP/requires-notarget.f90 b/flang/test/Lower/OpenMP/FIR/requires-notarget.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/requires-notarget.f90
rename to flang/test/Lower/OpenMP/FIR/requires-notarget.f90
diff --git a/flang/test/Lower/OpenMP/requires.f90 b/flang/test/Lower/OpenMP/FIR/requires.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/requires.f90
rename to flang/test/Lower/OpenMP/FIR/requires.f90
diff --git a/flang/test/Lower/OpenMP/rtl-flags.f90 b/flang/test/Lower/OpenMP/FIR/rtl-flags.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/rtl-flags.f90
rename to flang/test/Lower/OpenMP/FIR/rtl-flags.f90
diff --git a/flang/test/Lower/OpenMP/sections-pft.f90 b/flang/test/Lower/OpenMP/FIR/sections-pft.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/sections-pft.f90
rename to flang/test/Lower/OpenMP/FIR/sections-pft.f90
diff --git a/flang/test/Lower/OpenMP/sections.f90 b/flang/test/Lower/OpenMP/FIR/sections.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/sections.f90
rename to flang/test/Lower/OpenMP/FIR/sections.f90
diff --git a/flang/test/Lower/OpenMP/simd.f90 b/flang/test/Lower/OpenMP/FIR/simd.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/simd.f90
rename to flang/test/Lower/OpenMP/FIR/simd.f90
diff --git a/flang/test/Lower/OpenMP/simple-barrier.f90 b/flang/test/Lower/OpenMP/FIR/simple-barrier.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/simple-barrier.f90
rename to flang/test/Lower/OpenMP/FIR/simple-barrier.f90
diff --git a/flang/test/Lower/OpenMP/single.f90 b/flang/test/Lower/OpenMP/FIR/single.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/single.f90
rename to flang/test/Lower/OpenMP/FIR/single.f90
diff --git a/flang/test/Lower/OpenMP/stop-stmt-in-region.f90 b/flang/test/Lower/OpenMP/FIR/stop-stmt-in-region.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/stop-stmt-in-region.f90
rename to flang/test/Lower/OpenMP/FIR/stop-stmt-in-region.f90
diff --git a/flang/test/Lower/OpenMP/target.f90 b/flang/test/Lower/OpenMP/FIR/target.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/target.f90
rename to flang/test/Lower/OpenMP/FIR/target.f90
diff --git a/flang/test/Lower/OpenMP/target_cpu_features.f90 b/flang/test/Lower/OpenMP/FIR/target_cpu_features.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/target_cpu_features.f90
rename to flang/test/Lower/OpenMP/FIR/target_cpu_features.f90
diff --git a/flang/test/Lower/OpenMP/task.f90 b/flang/test/Lower/OpenMP/FIR/task.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/task.f90
rename to flang/test/Lower/OpenMP/FIR/task.f90
diff --git a/flang/test/Lower/OpenMP/taskgroup.f90 b/flang/test/Lower/OpenMP/FIR/taskgroup.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/taskgroup.f90
rename to flang/test/Lower/OpenMP/FIR/taskgroup.f90
diff --git a/flang/test/Lower/OpenMP/taskwait.f90 b/flang/test/Lower/OpenMP/FIR/taskwait.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/taskwait.f90
rename to flang/test/Lower/OpenMP/FIR/taskwait.f90
diff --git a/flang/test/Lower/OpenMP/taskyield.f90 b/flang/test/Lower/OpenMP/FIR/taskyield.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/taskyield.f90
rename to flang/test/Lower/OpenMP/FIR/taskyield.f90
diff --git a/flang/test/Lower/OpenMP/teams.f90 b/flang/test/Lower/OpenMP/FIR/teams.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/teams.f90
rename to flang/test/Lower/OpenMP/FIR/teams.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-char-array-chararray.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-char-array-chararray.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-char-array-chararray.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-char-array-chararray.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-commonblock.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-commonblock.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-commonblock.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-commonblock.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-integer-different-kinds.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-integer-different-kinds.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-integer-different-kinds.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-integer-different-kinds.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-non-global.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-non-global.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-non-global.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-non-global.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-pointer-allocatable.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-pointer-allocatable.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-pointer-allocatable.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-pointer-allocatable.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-real-logical-complex-derivedtype.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-real-logical-complex-derivedtype.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-real-logical-complex-derivedtype.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-real-logical-complex-derivedtype.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-use-association-2.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-use-association-2.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-use-association-2.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-use-association-2.f90
diff --git a/flang/test/Lower/OpenMP/threadprivate-use-association.f90 b/flang/test/Lower/OpenMP/FIR/threadprivate-use-association.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/threadprivate-use-association.f90
rename to flang/test/Lower/OpenMP/FIR/threadprivate-use-association.f90
diff --git a/flang/test/Lower/OpenMP/unstructured.f90 b/flang/test/Lower/OpenMP/FIR/unstructured.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/unstructured.f90
rename to flang/test/Lower/OpenMP/FIR/unstructured.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-chunks.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-chunks.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-chunks.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-chunks.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-collapse.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-collapse.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-collapse.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-collapse.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-monotonic.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-monotonic.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-monotonic.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-monotonic.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-nonmonotonic.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-nonmonotonic.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-nonmonotonic.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-nonmonotonic.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-ordered.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-ordered.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-ordered.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-ordered.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-add.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-add.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-add.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-add.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-iand.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-iand.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-iand.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-iand.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-ieor.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-ieor.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-ieor.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-ieor.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-ior.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-ior.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-ior.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-ior.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-logical-and.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-and.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-logical-and.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-and.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-logical-eqv.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-eqv.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-logical-eqv.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-eqv.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-logical-neqv.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-neqv.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-logical-neqv.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-neqv.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-logical-or.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-or.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-logical-or.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-or.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-max.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-max.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-max.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-max.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-min.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-min.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-min.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-min.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-mul.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-reduction-mul.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-reduction-mul.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-reduction-mul.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-simd.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-simd.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-simd.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-simd.f90
diff --git a/flang/test/Lower/OpenMP/wsloop-variable.f90 b/flang/test/Lower/OpenMP/FIR/wsloop-variable.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop-variable.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop-variable.f90
diff --git a/flang/test/Lower/OpenMP/wsloop.f90 b/flang/test/Lower/OpenMP/FIR/wsloop.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/wsloop.f90
rename to flang/test/Lower/OpenMP/FIR/wsloop.f90