diff --git a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
index 3eb4be78dcb..ca90feaef26 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { riscv32*-*-* } } } */
+/* { dg-do compile { target { rv32 } } } */
 /* { dg-options "-march=rv32gc_zbc" } */
 
 #include <stdint-gcc.h>
diff --git a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
index d99a78daaa9..f31a8bd949f 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { riscv64*-*-* } } } */
+/* { dg-do compile { target { rv64 } } } */
 /* { dg-options "-march=rv64gc_zbc" } */
 
 #include <stdint-gcc.h>