diff --git a/test/encrypt.c b/test/encrypt.c
index 99e38ec..232a8f8 100644
--- a/test/encrypt.c
+++ b/test/encrypt.c
@@ -90,7 +90,7 @@
 
 		if (pRecipient2 != NULL) {
 			alg = COSE_Recipient_map_get_int(pRecipient2, COSE_Header_Algorithm, COSE_BOTH, NULL);
-			if (!IsAlgorithmSupported(alg->v.sint)) fNoSupport = true;
+			if ((alg != NULL) && !IsAlgorithmSupported(alg->v.sint)) fNoSupport = true;
 		}
 		alg = COSE_Recipient_map_get_int(pRecipient1, COSE_Header_Algorithm, COSE_BOTH, NULL);
 		if ((alg != NULL) && !IsAlgorithmSupported(alg->v.sint)) fNoSupport = true;
diff --git a/test/test.c b/test/test.c
index bbdc42e..4706d9b 100644
--- a/test/test.c
+++ b/test/test.c
@@ -134,6 +134,30 @@
 	default:
 		return false;
 
+#ifdef USE_AES_CCM_16_64_128
+	case COSE_Algorithm_AES_CCM_16_64_128:
+#endif
+#ifdef USE_AES_CCM_16_64_256
+		case COSE_Algorithm_AES_CCM_16_64_256:
+#endif
+#ifdef USE_AES_CCM_64_64_128
+		case COSE_Algorithm_AES_CCM_64_64_128:
+#endif
+#ifdef USE_AES_CCM_64_64_256
+		case COSE_Algorithm_AES_CCM_64_64_256:
+#endif
+#ifdef USE_AES_CCM_16_128_128
+		case COSE_Algorithm_AES_CCM_16_128_128:
+#endif
+#ifdef USE_AES_CCM_16_128_256
+		case COSE_Algorithm_AES_CCM_16_128_256:
+#endif
+#ifdef USE_AES_CCM_64_128_128
+		case COSE_Algorithm_AES_CCM_64_128_128:
+#endif
+#ifdef USE_AES_CCM_64_128_256
+		case COSE_Algorithm_AES_CCM_64_128_256:
+#endif
 #ifdef USE_AES_GCM_128
 	case COSE_Algorithm_AES_GCM_128:
 #endif