diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 89c6616..17fdb21 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -32,6 +32,7 @@
 #include "mbedtls/dhm.h"
 #include "mbedtls/gcm.h"
 #include "mbedtls/ccm.h"
+#include "mbedtls/cmac.h"
 #include "mbedtls/md2.h"
 #include "mbedtls/md4.h"
 #include "mbedtls/md5.h"
@@ -277,6 +278,11 @@
     suites_tested++;
 #endif
 
+#if defined(MBEDTLS_CMAC_C) && defined(MBEDTLS_AES_C)
+    if( ( ret = mbedtls_cmac_self_test( v ) ) != 0 )
+        return( ret );
+#endif
+
 #if defined(MBEDTLS_BASE64_C)
     if( mbedtls_base64_self_test( v ) != 0 )
     {