diff --git a/tests/dump-cert-chain-to-text.t b/tests/dump-cert-chain-to-text.t
index 2255a3a..e4c71df 100644
--- a/tests/dump-cert-chain-to-text.t
+++ b/tests/dump-cert-chain-to-text.t
@@ -114,17 +114,21 @@ Dump a live cert chain (squareup-chain.crt)
   Not After : 2017-07-31 20:45:50 +0000 UTC
   Signature : SHA256-RSA
   Subject Info:
-  \tCommonName: www.squareup.com (esc)
-  \tOrganization: Square, Inc. (esc)
   \tCountry: US (esc)
-  \tLocality: San Francisco (esc)
   \tProvince: California (esc)
+  \tLocality: San Francisco (esc)
+  \tEV Country: US (esc)
+  \tEV Province: Delaware (esc)
+  \tOrganization: Square, Inc. (esc)
+  \tBusiness Category: Private Organization (esc)
+  \tSerial Number: 4699855 (esc)
+  \tCommonName: www.squareup.com (esc)
   Issuer Info:
-  \tCommonName: Entrust Certification Authority - L1M (esc)
+  \tCountry: US (esc)
   \tOrganization: Entrust, Inc. (esc)
   \tOrganizationalUnit: See www.entrust.net/legal-terms (esc)
   \tOrganizationalUnit: (c) 2014 Entrust, Inc. - for authorized use only (esc)
-  \tCountry: US (esc)
+  \tCommonName: Entrust Certification Authority - L1M (esc)
   Subject Key ID   : D4:17:14:6F:0B:C5:20:A1:D6:FE:21:7E:DC:9E:F8:57:9C:ED:AE:6A
   Authority Key ID : C3:F7:D0:B5:2A:30:AD:AF:0D:91:21:70:39:54:DD:BC:89:70:C7:3A
   Basic Constraints: CA:false
@@ -152,17 +156,17 @@ Dump a live cert chain (squareup-chain.crt)
   Not After : 2030-10-15 15:55:03 +0000 UTC
   Signature : SHA256-RSA
   Subject Info:
-  \tCommonName: Entrust Certification Authority - L1M (esc)
+  \tCountry: US (esc)
   \tOrganization: Entrust, Inc. (esc)
   \tOrganizationalUnit: See www.entrust.net/legal-terms (esc)
   \tOrganizationalUnit: (c) 2014 Entrust, Inc. - for authorized use only (esc)
-  \tCountry: US (esc)
+  \tCommonName: Entrust Certification Authority - L1M (esc)
   Issuer Info:
-  \tCommonName: Entrust Root Certification Authority - G2 (esc)
+  \tCountry: US (esc)
   \tOrganization: Entrust, Inc. (esc)
   \tOrganizationalUnit: See www.entrust.net/legal-terms (esc)
   \tOrganizationalUnit: (c) 2009 Entrust, Inc. - for authorized use only (esc)
-  \tCountry: US (esc)
+  \tCommonName: Entrust Root Certification Authority - G2 (esc)
   Subject Key ID   : C3:F7:D0:B5:2A:30:AD:AF:0D:91:21:70:39:54:DD:BC:89:70:C7:3A
   Authority Key ID : 6A:72:26:7A:D0:1E:EF:7D:E7:3B:69:51:D4:6C:8D:9F:90:12:66:AB
   Basic Constraints: CA:true, pathlen:0
@@ -179,17 +183,17 @@ Dump a live cert chain (squareup-chain.crt)
   Not After : 2024-09-23 01:31:53 +0000 UTC
   Signature : SHA256-RSA
   Subject Info:
-  \tCommonName: Entrust Root Certification Authority - G2 (esc)
+  \tCountry: US (esc)
   \tOrganization: Entrust, Inc. (esc)
   \tOrganizationalUnit: See www.entrust.net/legal-terms (esc)
   \tOrganizationalUnit: (c) 2009 Entrust, Inc. - for authorized use only (esc)
-  \tCountry: US (esc)
+  \tCommonName: Entrust Root Certification Authority - G2 (esc)
   Issuer Info:
-  \tCommonName: Entrust Root Certification Authority (esc)
+  \tCountry: US (esc)
   \tOrganization: Entrust, Inc. (esc)
   \tOrganizationalUnit: www.entrust.net/CPS is incorporated by reference (esc)
   \tOrganizationalUnit: (c) 2006 Entrust, Inc. (esc)
-  \tCountry: US (esc)
+  \tCommonName: Entrust Root Certification Authority (esc)
   Subject Key ID   : 6A:72:26:7A:D0:1E:EF:7D:E7:3B:69:51:D4:6C:8D:9F:90:12:66:AB
   Authority Key ID : 68:90:E4:67:A4:A6:53:80:C7:86:66:A4:F1:F7:4B:43:FB:84:BD:6D
   Basic Constraints: CA:true, pathlen:1
diff --git a/tests/dump-leaf-to-text.t b/tests/dump-leaf-to-text.t
index d72ca93..d2abcc7 100644
--- a/tests/dump-leaf-to-text.t
+++ b/tests/dump-leaf-to-text.t
@@ -33,17 +33,17 @@ Dump an example certificate (example-leaf.crt)
   Not After : 2023-04-15 22:14:11 +0000 UTC
   Signature : SHA256-RSA
   Subject Info:
-  \tCommonName: example-leaf (esc)
-  \tOrganization: certigo (esc)
-  \tOrganizationalUnit: example (esc)
   \tCountry: US (esc)
   \tProvince: CA (esc)
+  \tOrganization: certigo (esc)
+  \tOrganizationalUnit: example (esc)
+  \tCommonName: example-leaf (esc)
   Issuer Info:
-  \tCommonName: example-leaf (esc)
-  \tOrganization: certigo (esc)
-  \tOrganizationalUnit: example (esc)
   \tCountry: US (esc)
   \tProvince: CA (esc)
+  \tOrganization: certigo (esc)
+  \tOrganizationalUnit: example (esc)
+  \tCommonName: example-leaf (esc)
   Extended Key Usage:
   \tClient Auth (esc)
   \tServer Auth (esc)
diff --git a/tests/dump-small-key-to-text.t b/tests/dump-small-key-to-text.t
index 0ae7290..797eef8 100644
--- a/tests/dump-small-key-to-text.t
+++ b/tests/dump-small-key-to-text.t
@@ -26,17 +26,17 @@ Dump an example certificate (example-leaf.crt)
   Not After : 2023-04-15 22:14:12 +0000 UTC
   Signature : SHA256-RSA (self-signed)
   Subject Info:
-  \tCommonName: example-small-key (esc)
-  \tOrganization: certigo (esc)
-  \tOrganizationalUnit: example (esc)
   \tCountry: US (esc)
   \tProvince: CA (esc)
+  \tOrganization: certigo (esc)
+  \tOrganizationalUnit: example (esc)
+  \tCommonName: example-small-key (esc)
   Issuer Info:
-  \tCommonName: example-small-key (esc)
-  \tOrganization: certigo (esc)
-  \tOrganizationalUnit: example (esc)
   \tCountry: US (esc)
   \tProvince: CA (esc)
+  \tOrganization: certigo (esc)
+  \tOrganizationalUnit: example (esc)
+  \tCommonName: example-small-key (esc)
   Warnings:
   \tCertificate is not in X509v3 format (version is 2) (esc)
   \tSize of RSA key should be at least 2048 bits (esc)