diff --git a/clang/test/Driver/cheri/cheriot.c b/clang/test/Driver/cheri/cheriot.c
index 8877a2fac9acc..1d33c5824411e 100644
--- a/clang/test/Driver/cheri/cheriot.c
+++ b/clang/test/Driver/cheri/cheriot.c
@@ -1,9 +1,17 @@
-// RUN: %clang -target riscv32cheriot-unknown-unknown -mcpu=cheriot -### -c %s 2>&1 | FileCheck %s -check-prefixes BAREMETAL,ALL
-// RUN: %clang -target riscv32cheriot-unknown-unknown -mabi=cheriot-baremetal -### -c %s 2>&1 | FileCheck %s -check-prefixes BAREMETAL,ALL
-// RUN: %clang -target riscv32cheriot-unknown-cheriotrtos -### -c %s 2>&1 | FileCheck %s -check-prefixes RTOS,ALL
+// RUN: %clang -target riscv32cheriot-unknown-unknown -mcpu=cheriot -### -c %s 2>&1 | FileCheck %s -check-prefixes BAREMETAL,CHERIOT,ALL
+// RUN: %clang -target riscv32cheriot-unknown-unknown -mabi=cheriot-baremetal -### -c %s 2>&1 | FileCheck %s -check-prefixes BAREMETAL,CHERIOT,ALL
+// RUN: %clang -target riscv32cheriot-unknown-cheriotrtos -### -c %s 2>&1 | FileCheck %s -check-prefixes RTOS,CHERIOT,ALL
+// RUN: %clang -target riscv32cheriot-unknown-unknown -mcpu=cheriot-ibex -### -c %s 2>&1 | FileCheck %s -check-prefixes IBEX,ALL
+// RUN: %clang -target riscv32cheriot-unknown-unknown -mcpu=cheriot-kudu -### -c %s 2>&1 | FileCheck %s -check-prefixes KUDU,ALL
 
+// CHERIOT: "-target-cpu" "cheriot"
+// IBEX: "-target-cpu" "cheriot-ibex"
+// KUDU: "-target-cpu" "cheriot-kudu"
+
+// CHERIOT-NOT: "-target-feature" "+b"
+// IBEX: "-target-feature" "+b"
+// KUDU: "-target-feature" "+b"
 
-// ALL: "-target-cpu" "cheriot"
 // ALL: "-target-feature" "+xcheriot"
 
 // BAREMETAL: "-target-abi" "cheriot-baremetal"
diff --git a/llvm/lib/Target/RISCV/RISCVProcessors.td b/llvm/lib/Target/RISCV/RISCVProcessors.td
index 076ce4cbb4787..f9646c1c53361 100644
--- a/llvm/lib/Target/RISCV/RISCVProcessors.td
+++ b/llvm/lib/Target/RISCV/RISCVProcessors.td
@@ -812,12 +812,12 @@ def CHERIOT_IBEX
     : RISCVProcessorModel<"cheriot-ibex", NoSchedModel,
                           [Feature32Bit, FeatureVendorXCheri,
                            FeatureVendorXCheriot, FeatureVendorXCheriPureCap,
-                           FeatureStdExtC, FeatureStdExtE, FeatureStdExtM,
-                           FeatureUnalignedScalarMem]>;
+                           FeatureStdExtB, FeatureStdExtC, FeatureStdExtE,
+                           FeatureStdExtM, FeatureUnalignedScalarMem]>;
 
 def CHERIOT_KUDU
     : RISCVProcessorModel<"cheriot-kudu", NoSchedModel,
                           [Feature32Bit, FeatureVendorXCheri,
                            FeatureVendorXCheriot, FeatureVendorXCheriPureCap,
-                           FeatureStdExtC, FeatureStdExtE, FeatureStdExtM,
-                           FeatureUnalignedScalarMem]>;
+                           FeatureStdExtB, FeatureStdExtC, FeatureStdExtE,
+                           FeatureStdExtM, FeatureUnalignedScalarMem]>;