diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 74eed59..33f96ea 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -279,8 +279,11 @@
 #endif
 
 #if defined(MBEDTLS_CMAC_C) && ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) )
-    if( ( ret = mbedtls_cmac_self_test( v ) ) != 0 )
-        return( ret );
+    if( ( mbedtls_cmac_self_test( v ) ) != 0 )
+    {
+        suites_failed++;
+    }
+    suites_tested++;
 #endif
 
 #if defined(MBEDTLS_BASE64_C)