diff --git a/testing/crypto/Kconfig b/testing/crypto/Kconfig
index d951f9ea5..ce0ed64ed 100644
--- a/testing/crypto/Kconfig
+++ b/testing/crypto/Kconfig
@@ -6,6 +6,26 @@ config TESTING_CRYPTO
 
 if TESTING_CRYPTO
 
+config TESTING_CRYPTO_3DES_CBC
+	bool "3des-cbc crypto test"
+	default y
+
+config TESTING_CRYPTO_AES_CBC
+	bool "aes-cbc crypto test"
+	default y
+
+config TESTING_CRYPTO_AES_CTR
+	bool "aes-ctr crypto test"
+	default y
+
+config TESTING_CRYPTO_AES_XTS
+	bool "aes-xts crypto test"
+	default y
+
+config TESTING_CRYPTO_HMAC
+	bool "hmac crypto test"
+	default y
+
 config TESTING_CRYPTO_PRIORITY
 	int "crypto test task priority"
 	default 100
diff --git a/testing/crypto/Makefile b/testing/crypto/Makefile
index 7f1c44515..25a0caefc 100644
--- a/testing/crypto/Makefile
+++ b/testing/crypto/Makefile
@@ -21,8 +21,31 @@
 include $(APPDIR)/Make.defs
 
 # Generic file system stress test application info
-PROGNAME = des3cbc aesxts aesctr hmac aescbc
-MAINSRC =  3descbc.c aesxts.c aesctr.c hmac.c aescbc.c
+ifeq ($(CONFIG_TESTING_CRYPTO_3DES_CBC),y)
+PROGNAME += des3cbc
+MAINSRC  += 3descbc.c
+endif
+
+ifeq ($(CONFIG_TESTING_CRYPTO_AES_XTS),y)
+PROGNAME += aesxts
+MAINSRC  += aesxts.c
+endif
+
+ifeq ($(CONFIG_TESTING_CRYPTO_AES_CTR),y)
+PROGNAME += aesctr
+MAINSRC  += aesctr.c
+endif
+
+ifeq ($(CONFIG_TESTING_CRYPTO_AES_CBC),y)
+PROGNAME += aescbc
+MAINSRC  += aescbc.c
+endif
+
+ifeq ($(CONFIG_TESTING_CRYPTO_HMAC),y)
+PROGNAME += hmac
+MAINSRC  += hmac.c
+endif
+
 PRIORITY = $(CONFIG_TESTING_CRYPTO_PRIORITY)
 STACKSIZE = $(CONFIG_TESTING_CRYPTO_STACKSIZE)
 MODULE = $(CONFIG_TESTING_CRYPTO)