diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index f585412..083283b 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -98,6 +98,9 @@
 * ``asymmetric/public/PKCS1/rsa.pub.pem`` and
   ``asymmetric/public/PKCS1/rsa.pub.der`` are PKCS1 conversions of the public
   key from ``asymmetric/PKCS8/unenc-rsa-pkcs8.pem`` using PEM and DER encoding.
+* ``x509/custom/ca/ca_key.pem`` - An unencrypted PCKS8 ``secp256r1`` key. It is
+  the private key for the certificate ``x509/custom/ca/ca.pem``. This key is
+  encoded in several of the PKCS12 custom vectors.
 
 
 Key exchange
@@ -351,6 +354,9 @@
   a ``policyConstraints`` extension with a ``requireExplicitPolicy`` value.
 * ``freshestcrl.pem`` - A self-signed certificate containing a ``freshestCRL``
   extension.
+* ``ca/ca.pem`` - A self-signed certificate with ``basicConstraints`` set to
+  true. Its private key is ``ca/ca_key.pem``. This certificate is encoded in
+  several of the PKCS12 custom vectors.
 
 Custom X.509 Request Vectors
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -467,6 +473,20 @@
 * ``x509/ocsp/req-ext-nonce.der`` - An OCSP request containing a nonce
   extension.
 
+Custom PKCS12 Test Vectors
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+* ``pkcs12/cert-key-aes256cbc.p12`` - A PKCS12 file containing a cert
+  (``x509/custom/ca/ca.pem``) and key (``x509/custom/ca/ca_key.pem``)
+  both encrypted with AES 256 CBC with the password ``cryptography``.
+* ``pkcs12/cert-none-key-none.p12`` - A PKCS12 file containing a cert
+  (``x509/custom/ca/ca.pem``) and key (``x509/custom/ca/ca_key.pem``)
+  with no encryption. The password (used for integrity checking only) is
+  ``cryptography``.
+* ``cert-rc2-key-3des.p12`` - A PKCS12 file containing a cert
+  (``x509/custom/ca/ca.pem``) encrypted with RC2 and key
+  (``x509/custom/ca/ca_key.pem``) encrypted via 3DES with the password
+  ``cryptography``.
+
 Hashes
 ~~~~~~
 
diff --git a/vectors/cryptography_vectors/pkcs12/cert-key-aes256cbc.p12 b/vectors/cryptography_vectors/pkcs12/cert-key-aes256cbc.p12
new file mode 100644
index 0000000..5bb25fa
--- /dev/null
+++ b/vectors/cryptography_vectors/pkcs12/cert-key-aes256cbc.p12
Binary files differ
diff --git a/vectors/cryptography_vectors/pkcs12/cert-none-key-none.p12 b/vectors/cryptography_vectors/pkcs12/cert-none-key-none.p12
new file mode 100644
index 0000000..b3f5c2a
--- /dev/null
+++ b/vectors/cryptography_vectors/pkcs12/cert-none-key-none.p12
Binary files differ
diff --git a/vectors/cryptography_vectors/pkcs12/cert-rc2-key-3des.p12 b/vectors/cryptography_vectors/pkcs12/cert-rc2-key-3des.p12
new file mode 100644
index 0000000..9041671
--- /dev/null
+++ b/vectors/cryptography_vectors/pkcs12/cert-rc2-key-3des.p12
Binary files differ
diff --git a/vectors/cryptography_vectors/x509/custom/ca/ca.pem b/vectors/cryptography_vectors/x509/custom/ca/ca.pem
new file mode 100644
index 0000000..5ca8028
--- /dev/null
+++ b/vectors/cryptography_vectors/x509/custom/ca/ca.pem
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBUTCB96ADAgECAgIDCTAKBggqhkjOPQQDAjAnMQswCQYDVQQGEwJVUzEYMBYG
+A1UEAwwPY3J5cHRvZ3JhcGh5IENBMB4XDTE3MDEwMTEyMDEwMFoXDTM4MTIzMTA4
+MzAwMFowJzELMAkGA1UEBhMCVVMxGDAWBgNVBAMMD2NyeXB0b2dyYXBoeSBDQTBZ
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBj/z7v5Obj13cPuwECLBnUGq0/N2CxS
+JE4f4BBGZ7VfFblivTvPDG++Gve0oQ+0uctuhrNQ+WxRv8GC177F+QWjEzARMA8G
+A1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIhANES742XWm64tkGnz8Dn
+pG6u2lHkZFQr3oaVvPcemvlbAiEA0WGGzmYx5C9UvfXIK7NEziT4pQtyESE0uRVK
+Xw4nMqk=
+-----END CERTIFICATE-----
diff --git a/vectors/cryptography_vectors/x509/custom/ca/ca_key.pem b/vectors/cryptography_vectors/x509/custom/ca/ca_key.pem
new file mode 100644
index 0000000..2fb5394
--- /dev/null
+++ b/vectors/cryptography_vectors/x509/custom/ca/ca_key.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgA8Zqz5vLeR0ePZUe
+jBfdyMmnnI4U5uAJApWTsMn/RuWhRANCAAQY/8+7+Tm49d3D7sBAiwZ1BqtPzdgs
+UiROH+AQRme1XxW5Yr07zwxvvhr3tKEPtLnLboazUPlsUb/Bgte+xfkF
+-----END PRIVATE KEY-----