diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index f47f08d..3f3c8b0 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -15,6 +15,8 @@
 
 * RSA PKCS1 from the RSA FTP site (ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/
   and ftp://ftp.rsa.com/pub/rsalabs/tmp/).
+* OpenSSL PEM serialization vectors from the `OpenSSL`_ and `GnuTLS`_ test
+  suites.
 
 Hashes
 ~~~~~~
@@ -100,3 +102,5 @@
 .. _`Whirlpool website`: http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html
 .. _`Specification repository`: https://github.com/fernet/spec
 .. _`errata`: http://www.rfc-editor.org/errata_search.php?rfc=6238
+.. _`OpenSSL`: https://www.openssl.org/
+.. _`GnuTLS`: http://www.gnutls.org/
diff --git a/tests/hazmat/primitives/vectors/asymmetric/GnuTLS/key1.pem b/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key1.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/GnuTLS/key1.pem
rename to tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key1.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/GnuTLS/key2.pem b/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key2.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/GnuTLS/key2.pem
rename to tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key2.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL/testrsa-encrypted.pem b/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL/testrsa-encrypted.pem
rename to tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL/testrsa.pem b/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL/testrsa.pem
rename to tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem