diff --git a/clang/test/Driver/riscv-option-arch.c b/clang/test/Driver/riscv-option-arch.c
deleted file mode 100644
index 9f0e037cd12e0..0000000000000
--- a/clang/test/Driver/riscv-option-arch.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// REQUIRES: riscv-registered-target
-// RUN: %clang --target=riscv64 -menable-experimental-extensions -c -o /dev/null %s
-// RUN: ! %clang --target=riscv64 -c -o /dev/null %s 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
-
-void foo() {
-  asm volatile (".option arch, +zicfiss");
-  // CHECK-ERR: Unexpected experimental extensions.
-}
diff --git a/clang/test/Driver/riscv-option-arch.s b/clang/test/Driver/riscv-option-arch.s
deleted file mode 100644
index c4ca4aa459ce2..0000000000000
--- a/clang/test/Driver/riscv-option-arch.s
+++ /dev/null
@@ -1,6 +0,0 @@
-# REQUIRES: riscv-registered-target
-# RUN: %clang --target=riscv64 -menable-experimental-extensions -c -o /dev/null %s
-# RUN: ! %clang --target=riscv64 -c -o /dev/null %s 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
-
-.option arch, +zicfiss
-# CHECK-ERR: Unexpected experimental extensions.