diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am
index 557729770..f6a9c6099 100644
--- a/tests/cms/Makefile.am
+++ b/tests/cms/Makefile.am
@@ -102,6 +102,8 @@ EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
              samplekeys/t6752-ov-user-ff.p12 \
              samplekeys/edward.tester@demo.gnupg.com.p12 \
 	     samplekeys/nistp256-openssl-self-signed.p12 \
+             samplekeys/credential_private_encrypted_AES256.p12 \
+             samplekeys/credential_private_encrypted_3DES.p12 \
              samplemsgs/pwri-sample.cbc.p7m \
              samplemsgs/pwri-sample.cbc-2.p7m \
              samplemsgs/pwri-sample.gcm.p7m \
diff --git a/tests/cms/samplekeys/Description-p12 b/tests/cms/samplekeys/Description-p12
index 01276087f..7d80caa1e 100644
--- a/tests/cms/samplekeys/Description-p12
+++ b/tests/cms/samplekeys/Description-p12
@@ -51,4 +51,16 @@ Pass: start
 Cert: 4753a910e0c8b4caa8663ca0e4273a884eb5397d
 Key:  93be89edd11214ab74280d988a665b6beef876c5
 
+Name: credential_private_encrypted_AES256.p12
+Desc: AES256 encrypted P12 file from T6940
+Pass: qeFGds84/Sf0eKkJwcp6
+Cert: 20f65740b4a15bac6d6a299026756088f7604937,cbb4b26f93cfd9715ac9fa43440470df9395571b
+Key:  37eedaaf317edb69029eed79f69dd479fb10bf08
+
+Name: credential_private_encrypted_3DES.p12
+Desc: 3DES encrypted P12 file from T6940
+Pass: qeFGds84/Sf0eKkJwcp6
+Cert: 20f65740b4a15bac6d6a299026756088f7604937,cbb4b26f93cfd9715ac9fa43440470df9395571b
+Key:  37eedaaf317edb69029eed79f69dd479fb10bf08
+
 # eof #
diff --git a/tests/cms/samplekeys/credential_private_encrypted_3DES.p12 b/tests/cms/samplekeys/credential_private_encrypted_3DES.p12
new file mode 100644
index 000000000..58e80467d
Binary files /dev/null and b/tests/cms/samplekeys/credential_private_encrypted_3DES.p12 differ
diff --git a/tests/cms/samplekeys/credential_private_encrypted_AES256.p12 b/tests/cms/samplekeys/credential_private_encrypted_AES256.p12
new file mode 100644
index 000000000..ced504c85
Binary files /dev/null and b/tests/cms/samplekeys/credential_private_encrypted_AES256.p12 differ