diff --git a/tests/suites/test_suite_aes.data b/tests/suites/test_suite_aes.data
index ddfddcf..56b3108 100644
--- a/tests/suites/test_suite_aes.data
+++ b/tests/suites/test_suite_aes.data
@@ -660,3 +660,6 @@
 
 AES-256-CFB128 Decrypt NIST KAT #12
 aes_decrypt_cfb128:"0000000000000000000000000000000000000000000000000000000000000000":"f8000000000000000000000000000000":"7818d800dcf6f4be1e0e94f403d1e4c2":"00000000000000000000000000000000"
+
+AES Selftest
+aes_selftest:
diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function
index 861ad2a..f915010 100644
--- a/tests/suites/test_suite_aes.function
+++ b/tests/suites/test_suite_aes.function
@@ -166,3 +166,9 @@
 }
 END_CASE
 
+BEGIN_CASE
+aes_selftest:
+{
+    TEST_ASSERT( aes_self_test( 0 ) == 0 );
+}
+END_CASE
diff --git a/tests/suites/test_suite_arc4.data b/tests/suites/test_suite_arc4.data
index 535bdd9..8f35425 100644
--- a/tests/suites/test_suite_arc4.data
+++ b/tests/suites/test_suite_arc4.data
@@ -6,3 +6,6 @@
 
 Test vector ARC4 [SSH ARCFOUR]
 arc4_crypt:"527569736c696e6e756e206c61756c75206b6f727669737373616e692c2074e4686be470e46964656e2070e4e46c6ce42074e47973696b75752e204b6573e479f66e206f6e206f6e6e69206f6d616e616e692c206b61736b6973617675756e206c61616b736f7420766572686f75752e20456e206d6120696c6f697473652c20737572652068756f6b61612c206d75747461206d657473e46e2074756d6d757573206d756c6c652074756f6b61612e205075756e746f2070696c76656e2c206d692068756b6b75752c207369696e746f20766172616e207475756c6973656e2c206d69206e756b6b75752e2054756f6b7375742076616e616d6f6e206a61207661726a6f74207665656e2c206e69697374e420737964e46d656e69206c61756c756e207465656e2e202d2045696e6f204c65696e6f":"29041972fb42ba5fc7127712f13829c9":"358186999001e6b5daf05eceeb7eee21e0689c1f00eea81f7dd2caaee1d2763e68af0ead33d66c268bc946c484fbe94c5f5e0b86a59279e4f824e7a640bd223210b0a61160b7bce986ea65688003596b630a6b90f8e0caf6912a98eb872176e83c202caa64166d2cce57ff1bca57b213f0ed1aa72fb8ea52b0be01cd1e412867720b326eb389d011bd70d8af035fb0d8589dbce3c666f5ea8d4c7954c50c3f340b0467f81b425961c11843074df620f208404b394cf9d37ff54b5f1ad8f6ea7da3c561dfa7281f964463d2cc35a4d1b03490dec51b0711fbd6f55f79234d5b7c766622a66de92be996461d5e4dc878ef9bca030521e8351e4baed2fd04f9467368c4ad6ac186d08245b263a2666d1f6c5420f1599dfd9f438921c2f5a463938ce0982265eef70179bc553f339eb1a4c1af5f6a547f"
+
+ARC4 Selftest
+arc4_selftest:
diff --git a/tests/suites/test_suite_arc4.function b/tests/suites/test_suite_arc4.function
index 343c0f6..d082955 100644
--- a/tests/suites/test_suite_arc4.function
+++ b/tests/suites/test_suite_arc4.function
@@ -24,3 +24,10 @@
     TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
 }
 END_CASE
+
+BEGIN_CASE
+arc4_selftest:
+{
+    TEST_ASSERT( arc4_self_test( 0 ) == 0 );
+}
+END_CASE
diff --git a/tests/suites/test_suite_base64.data b/tests/suites/test_suite_base64.data
index 4c31fa5..2f4a4da 100644
--- a/tests/suites/test_suite_base64.data
+++ b/tests/suites/test_suite_base64.data
@@ -39,3 +39,6 @@
 
 Test case base64_decode #7
 base64_decode:"Zm9vYmFy":"foobar"
+
+Base64 Selftest
+base64_selftest:
diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function
index 7482db4..6278ac2 100644
--- a/tests/suites/test_suite_base64.function
+++ b/tests/suites/test_suite_base64.function
@@ -34,3 +34,10 @@
     TEST_ASSERT( strcmp( (char *) dst_str, {dst_string} ) == 0 );
 }
 END_CASE
+
+BEGIN_CASE
+base64_selftest:
+{
+    TEST_ASSERT( base64_self_test( 0 ) == 0 );
+}
+END_CASE