diff --git a/llvm/test/CodeGen/RISCV/fold-vector-cmp.ll b/llvm/test/CodeGen/RISCV/rvv/fold-vector-cmp.ll
rename from llvm/test/CodeGen/RISCV/fold-vector-cmp.ll
rename to llvm/test/CodeGen/RISCV/rvv/fold-vector-cmp.ll
diff --git a/llvm/test/CodeGen/RISCV/fpclamptosat_vec.ll b/llvm/test/CodeGen/RISCV/rvv/fpclamptosat_vec.ll
rename from llvm/test/CodeGen/RISCV/fpclamptosat_vec.ll
rename to llvm/test/CodeGen/RISCV/rvv/fpclamptosat_vec.ll
diff --git a/llvm/test/CodeGen/RISCV/scalable-vector-struct.ll b/llvm/test/CodeGen/RISCV/rvv/scalable-vector-struct.ll
rename from llvm/test/CodeGen/RISCV/scalable-vector-struct.ll
rename to llvm/test/CodeGen/RISCV/rvv/scalable-vector-struct.ll
diff --git a/llvm/test/CodeGen/RISCV/vadd-vp-mask.ll b/llvm/test/CodeGen/RISCV/rvv/vadd-vp-mask.ll
rename from llvm/test/CodeGen/RISCV/vadd-vp-mask.ll
rename to llvm/test/CodeGen/RISCV/rvv/vadd-vp-mask.ll
diff --git a/llvm/test/CodeGen/RISCV/vec3-setcc-crash.ll b/llvm/test/CodeGen/RISCV/rvv/vec3-setcc-crash.ll
rename from llvm/test/CodeGen/RISCV/vec3-setcc-crash.ll
rename to llvm/test/CodeGen/RISCV/rvv/vec3-setcc-crash.ll
diff --git a/llvm/test/CodeGen/RISCV/vmul-vp-mask.ll b/llvm/test/CodeGen/RISCV/rvv/vmul-vp-mask.ll
rename from llvm/test/CodeGen/RISCV/vmul-vp-mask.ll
rename to llvm/test/CodeGen/RISCV/rvv/vmul-vp-mask.ll
diff --git a/llvm/test/CodeGen/RISCV/vsub-vp-mask.ll b/llvm/test/CodeGen/RISCV/rvv/vsub-vp-mask.ll
rename from llvm/test/CodeGen/RISCV/vsub-vp-mask.ll
rename to llvm/test/CodeGen/RISCV/rvv/vsub-vp-mask.ll