diff --git a/flang/test/Lower/OpenMP/omp-ordered-threads.f90 b/flang/test/Lower/OpenMP/ordered-threads.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-ordered-threads.f90
rename to flang/test/Lower/OpenMP/ordered-threads.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-firstprivate-clause-scalar.f90 b/flang/test/Lower/OpenMP/parallel-firstprivate-clause-scalar.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-firstprivate-clause-scalar.f90
rename to flang/test/Lower/OpenMP/parallel-firstprivate-clause-scalar.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-lastprivate-clause-scalar.f90 b/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-lastprivate-clause-scalar.f90
rename to flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-private-clause-fixes.f90 b/flang/test/Lower/OpenMP/parallel-private-clause-fixes.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-private-clause-fixes.f90
rename to flang/test/Lower/OpenMP/parallel-private-clause-fixes.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-private-clause.f90 b/flang/test/Lower/OpenMP/parallel-private-clause.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-private-clause.f90
rename to flang/test/Lower/OpenMP/parallel-private-clause.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90 b/flang/test/Lower/OpenMP/parallel-wsloop-firstpriv.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90
rename to flang/test/Lower/OpenMP/parallel-wsloop-firstpriv.f90
diff --git a/flang/test/Lower/OpenMP/omp-parallel-wsloop.f90 b/flang/test/Lower/OpenMP/parallel-wsloop.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-parallel-wsloop.f90
rename to flang/test/Lower/OpenMP/parallel-wsloop.f90
diff --git a/flang/test/Lower/OpenMP/omp-unstructured.f90 b/flang/test/Lower/OpenMP/unstructured.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-unstructured.f90
rename to flang/test/Lower/OpenMP/unstructured.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-chunks.f90 b/flang/test/Lower/OpenMP/wsloop-chunks.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-chunks.f90
rename to flang/test/Lower/OpenMP/wsloop-chunks.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-collapse.f90 b/flang/test/Lower/OpenMP/wsloop-collapse.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-collapse.f90
rename to flang/test/Lower/OpenMP/wsloop-collapse.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-monotonic.f90 b/flang/test/Lower/OpenMP/wsloop-monotonic.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-monotonic.f90
rename to flang/test/Lower/OpenMP/wsloop-monotonic.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-nonmonotonic.f90 b/flang/test/Lower/OpenMP/wsloop-nonmonotonic.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-nonmonotonic.f90
rename to flang/test/Lower/OpenMP/wsloop-nonmonotonic.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-ordered.f90 b/flang/test/Lower/OpenMP/wsloop-ordered.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-ordered.f90
rename to flang/test/Lower/OpenMP/wsloop-ordered.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-simd.f90 b/flang/test/Lower/OpenMP/wsloop-simd.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-simd.f90
rename to flang/test/Lower/OpenMP/wsloop-simd.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop-variable.f90 b/flang/test/Lower/OpenMP/wsloop-variable.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop-variable.f90
rename to flang/test/Lower/OpenMP/wsloop-variable.f90
diff --git a/flang/test/Lower/OpenMP/omp-wsloop.f90 b/flang/test/Lower/OpenMP/wsloop.f90
similarity index 100%
rename from flang/test/Lower/OpenMP/omp-wsloop.f90
rename to flang/test/Lower/OpenMP/wsloop.f90