diff --git a/gcc/testsuite/gcc.target/riscv/rvv/fortran/pr111395.f90 b/gcc/testsuite/gfortran.target/riscv/rvv/pr111395.f90
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/rvv/fortran/pr111395.f90
rename to gcc/testsuite/gfortran.target/riscv/rvv/pr111395.f90
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/fortran/pr111566.f90 b/gcc/testsuite/gfortran.target/riscv/rvv/pr111566.f90
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/rvv/fortran/pr111566.f90
rename to gcc/testsuite/gfortran.target/riscv/rvv/pr111566.f90
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/rvv-fortran.exp b/gcc/testsuite/gfortran.target/riscv/rvv/rvv.exp
similarity index 93%
rename from gcc/testsuite/gcc.target/riscv/rvv/rvv-fortran.exp
rename to gcc/testsuite/gfortran.target/riscv/rvv/rvv.exp
index c4185554697d357e5167af8d298a29c068a45606..c122e90d9897ac505b55399e18174eaa9f4dbb18 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/rvv-fortran.exp
+++ b/gcc/testsuite/gfortran.target/riscv/rvv/rvv.exp
@@ -39,7 +39,7 @@ dg-init
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-   [glob -nocomplain $srcdir/$subdir/fortran/*.\[fF\]{,90,95,03,08} ] ] "" ""
+   [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" ""
 
 # All done.
 dg-finish