diff --git a/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbc.c b/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbc.c
index 503b412f2e1..bfb724a0f70 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbc.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbc.c
@@ -1,6 +1,5 @@
-/* { dg-do run { target { riscv64*-*-* && riscv_zbc_ok } } } */
-/* { dg-options "-march=rv64gc_zbc -fdump-tree-crc -fdump-rtl-dfinish" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zbc -fdump-tree-crc -fdump-rtl-dfinish" { target { rv32 } } } */
+/* { dg-do run { target { rv64 && riscv_zbc_ok } } } */
+/* { dg-options "-march=rv64gc_zbc -fdump-tree-crc -fdump-rtl-dfinish" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
 
 #include "../../gcc.dg/torture/crc-21.c"
diff --git a/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbkc.c b/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbkc.c
index 2bf0172a837..92a9ca8398a 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbkc.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-21-rv64-zbkc.c
@@ -1,6 +1,5 @@
-/* { dg-do run { target { riscv64*-*-* && riscv_zbkc_ok } } } */
-/* { dg-options "-march=rv64gc_zbkc -fdump-tree-crc -fdump-rtl-dfinish" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zbkc -fdump-tree-crc -fdump-rtl-dfinish" { target { rv32 } } } */
+/* { dg-do run { target { rv64 && riscv_zbkc_ok } } } */
+/* { dg-options "-march=rv64gc_zbkc -fdump-tree-crc -fdump-rtl-dfinish" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
 
 #include "../../gcc.dg/torture/crc-21.c"