diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0460c63..142ebf1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,6 +43,7 @@
 add_test_suite(base64)
 add_test_suite(blowfish)
 add_test_suite(camellia)
+add_test_suite(ccm)
 add_test_suite(cipher cipher.aes)
 add_test_suite(cipher cipher.arc4)
 add_test_suite(cipher cipher.blowfish)
diff --git a/tests/Makefile b/tests/Makefile
index ce458ca..a0d136a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -34,7 +34,8 @@
 		test_suite_aes.cfb		test_suite_aes.rest		\
 		test_suite_arc4									\
 		test_suite_base64		test_suite_blowfish		\
-		test_suite_camellia		test_suite_cipher.aes	\
+		test_suite_camellia		test_suite_ccm			\
+		test_suite_cipher.aes							\
 		test_suite_cipher.arc4	test_suite_cipher.gcm	\
 		test_suite_cipher.blowfish						\
 		test_suite_cipher.camellia						\
@@ -198,6 +199,10 @@
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
 
+test_suite_ccm: test_suite_ccm.c $(DEP)
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
 test_suite_cipher.aes: test_suite_cipher.aes.c $(DEP)
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
diff --git a/tests/suites/test_suite_ccm.data b/tests/suites/test_suite_ccm.data
new file mode 100644
index 0000000..223e28a
--- /dev/null
+++ b/tests/suites/test_suite_ccm.data
@@ -0,0 +1,2 @@
+CCM self test
+ccm_self_test:
diff --git a/tests/suites/test_suite_ccm.function b/tests/suites/test_suite_ccm.function
new file mode 100644
index 0000000..487d1c5
--- /dev/null
+++ b/tests/suites/test_suite_ccm.function
@@ -0,0 +1,15 @@
+/* BEGIN_HEADER */
+#include <polarssl/ccm.h>
+/* END_HEADER */
+
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_CCM_C
+ * END_DEPENDENCIES
+ */
+
+/* BEGIN_CASE depends_on:POLARSSL_SELF_TEST:POLARSSL_AES_C */
+void ccm_self_test( )
+{
+    TEST_ASSERT( ccm_self_test( 0 ) == 0 );
+}
+/* END_CASE */