diff --git a/tests/unit/cbprintf/main.c b/tests/unit/cbprintf/main.c
index 64c7561c5bd..35234bb4df3 100644
--- a/tests/unit/cbprintf/main.c
+++ b/tests/unit/cbprintf/main.c
@@ -14,7 +14,6 @@
 #include <wctype.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/cbprintf.h>
 #include <sys/util.h>
 
 #define CBPRINTF_VIA_UNIT_TEST
@@ -96,6 +95,9 @@
 #if (VIA_TWISTER & 0x400) != 0
 #define CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE 1
 #endif
+#if (VIA_TWISTER & 0x800) != 0
+#define AVOID_C_GENERIC 1
+#endif
 
 #endif /* VIA_TWISTER */
 
@@ -114,6 +116,11 @@
 #define ENABLED_USE_PACKAGED false
 #endif
 
+#if AVOID_C_GENERIC
+#define Z_C_GENERIC 0
+#endif
+
+#include <sys/cbprintf.h>
 #include "../../../lib/os/cbprintf.c"
 
 #if defined(CONFIG_CBPRINTF_COMPLETE)
@@ -1219,14 +1226,15 @@ void test_main(void)
 	}
 	if (IS_ENABLED(CONFIG_CBPRINTF_COMPLETE)) {
 		TC_PRINT(" COMPLETE");
-		if (ENABLED_USE_PACKAGED) {
-			TC_PRINT(" PACKAGED\n");
-		} else {
-			TC_PRINT(" VA_LIST\n");
-		}
 	} else {
 		TC_PRINT(" NANO\n");
 	}
+	if (ENABLED_USE_PACKAGED) {
+		TC_PRINT(" PACKAGED %s C11 _Generic\n",
+				Z_C_GENERIC ? "with" : "without");
+	} else {
+		TC_PRINT(" VA_LIST\n");
+	}
 	if (IS_ENABLED(CONFIG_CBPRINTF_FULL_INTEGRAL)) {
 		TC_PRINT(" FULL_INTEGRAL\n");
 	} else {
diff --git a/tests/unit/cbprintf/testcase.yaml b/tests/unit/cbprintf/testcase.yaml
index 2e48580aef5..2b49f568b34 100644
--- a/tests/unit/cbprintf/testcase.yaml
+++ b/tests/unit/cbprintf/testcase.yaml
@@ -45,6 +45,21 @@ tests:
   utilities.prf.m32v281: # PACKAGED NANO + FULL
     extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x281
 
+  utilities.prf.m32va00: # PACKAGED REDUCED + AVOID_C_GENERIC
+    extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa00
+
+  utilities.prf.m32va01: # PACKAGED FULL + AVOID_C_GENERIC
+    extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa01
+
+  utilities.prf.m32va07: # PACKAGED FULL + FP + FP_A + AVOID_C_GENERIC
+    extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa07
+
+  utilities.prf.m32va08: # PACKAGED %n + AVOID_C_GENERIC
+    extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa08
+
+  utilities.prf.m32va81: # PACKAGED NANO + FULL + AVOID_C_GENERIC
+    extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa81
+
   utilities.prf.m64v00: # m64
     extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x00
 
@@ -95,3 +110,18 @@ tests:
 
   utilities.prf.m64v681: # PACKAGED NANO + FULL + LONG_DOUBLE PACKAGING
     extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x681
+
+  utilities.prf.m64va00: # PACKAGED REDUCED + AVOID_C_GENERIC
+    extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa00
+
+  utilities.prf.m64va01: # PACKAGED FULL + AVOID_C_GENERIC
+    extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa01
+
+  utilities.prf.m64va07: # PACKAGED FULL + FP + FP_A + AVOID_C_GENERIC
+    extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa07
+
+  utilities.prf.m64va08: # PACKAGED %n + AVOID_C_GENERIC
+    extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa08
+
+  utilities.prf.m64va81: # PACKAGED NANO + FULL + AVOID_C_GENERIC
+    extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa81