diff --git a/tests/api.c b/tests/api.c
index 520977ec18..a0991e2316 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -39717,6 +39717,7 @@ static int test_wolfSSL_X509_NAME_ENTRY(void)
 
         ExpectNotNull(subject = X509_NAME_oneline(nm, 0, 0));
         ExpectNotNull(XSTRSTR(subject, "favouriteDrink=tequila"));
+        ExpectNotNull(XSTRSTR(subject, "contentType=Server"));
     #ifdef DEBUG_WOLFSSL
         if (subject != NULL) {
             fprintf(stderr, "\n\t%s\n", subject);
@@ -57149,7 +57150,8 @@ static int test_ECDH_compute_key(void)
 #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
     defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_REQ) && \
     !defined(NO_ASN_TIME)
-static int test_openssl_make_self_signed_certificate(EVP_PKEY* pkey)
+static int test_openssl_make_self_signed_certificate(EVP_PKEY* pkey,
+        int expectedDerSz)
 {
     EXPECT_DECLS;
     X509* x509 = NULL;
@@ -57158,6 +57160,7 @@ static int test_openssl_make_self_signed_certificate(EVP_PKEY* pkey)
     time_t epoch_off = 0;
     ASN1_INTEGER* asn1_serial_number;
     long not_before, not_after;
+    int derSz;
 
     ExpectNotNull(x509 = X509_new());
 
@@ -57175,6 +57178,8 @@ static int test_openssl_make_self_signed_certificate(EVP_PKEY* pkey)
 
     ExpectIntNE(X509_NAME_add_entry_by_NID(name, NID_commonName, MBSTRING_UTF8,
         (unsigned char*)"www.wolfssl.com", -1, -1, 0), 0);
+    ExpectIntNE(X509_NAME_add_entry_by_NID(name, NID_pkcs9_contentType,
+                MBSTRING_UTF8,(unsigned char*)"Server", -1, -1, 0), 0);
 
     ExpectIntNE(X509_set_subject_name(x509, name), 0);
     ExpectIntNE(X509_set_issuer_name(x509, name), 0);
@@ -57188,6 +57193,9 @@ static int test_openssl_make_self_signed_certificate(EVP_PKEY* pkey)
 
     ExpectIntNE(X509_sign(x509, pkey, EVP_sha256()), 0);
 
+    ExpectNotNull(wolfSSL_X509_get_der(x509, &derSz));
+    ExpectIntGE(derSz, expectedDerSz);
+
     BN_free(serial_number);
     X509_NAME_free(name);
     X509_free(x509);
@@ -57205,6 +57213,7 @@ static int test_openssl_generate_key_and_cert(void)
     EC_KEY* ec_key = NULL;
 #endif
 #if !defined(NO_RSA)
+    int expectedDerSz;
     int key_length = 2048;
     BIGNUM* exponent = NULL;
     RSA* rsa = NULL;
@@ -57243,11 +57252,13 @@ static int test_openssl_generate_key_and_cert(void)
 
     #if !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
             defined(WOLFSSL_CERT_REQ) && !defined(NO_ASN_TIME)
-        ExpectIntEQ(test_openssl_make_self_signed_certificate(pkey),
-            TEST_SUCCESS);
+        expectedDerSz = 743;
+        ExpectIntEQ(test_openssl_make_self_signed_certificate(pkey,
+                    expectedDerSz), TEST_SUCCESS);
     #endif
     }
 
+    (void)expectedDerSz;
     EVP_PKEY_free(pkey);
     pkey = NULL;
     BN_free(exponent);
@@ -57269,7 +57280,9 @@ static int test_openssl_generate_key_and_cert(void)
 
 #if !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
         defined(WOLFSSL_CERT_REQ) && !defined(NO_ASN_TIME)
-    ExpectIntEQ(test_openssl_make_self_signed_certificate(pkey), TEST_SUCCESS);
+    expectedDerSz = 345;
+    ExpectIntEQ(test_openssl_make_self_signed_certificate(pkey, expectedDerSz),
+                TEST_SUCCESS);
 #endif
 
     EVP_PKEY_free(pkey);
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index b4292a9ca0..e225b99409 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -13194,6 +13194,7 @@ static int GetRDN(DecodedCert* cert, char* full, word32* idx, int* nid,
         *nid = NID_favouriteDrink;
     #endif
     }
+#ifdef WOLFSSL_CERT_REQ
     else if (oidSz == sizeof(attrPkcs9ContentTypeOid) &&
              XMEMCMP(oid, attrPkcs9ContentTypeOid, oidSz) == 0) {
         /* Set the pkcs9_contentType, type string, length and NID. */
@@ -13204,6 +13205,7 @@ static int GetRDN(DecodedCert* cert, char* full, word32* idx, int* nid,
         *nid = NID_pkcs9_contentType;
     #endif
     }
+#endif
     /* Other OIDs that start with the same values. */
     else if (oidSz == sizeof(dcOid) && XMEMCMP(oid, dcOid, oidSz-1) == 0) {
         WOLFSSL_MSG("Unknown pilot attribute type");
@@ -26475,9 +26477,12 @@ static int EncodeName(EncodedName* name, const char* nameStr,
             firstSz = cname->custom.oidSz;
             break;
     #endif
+    #ifdef WOLFSSL_CERT_REQ
         case ASN_CONTENT_TYPE:
             thisLen += (int)sizeof(attrPkcs9ContentTypeOid);
             firstSz  = (int)sizeof(attrPkcs9ContentTypeOid);
+            break;
+    #endif
         default:
             thisLen += DN_OID_SZ;
             firstSz  = DN_OID_SZ;
@@ -26542,6 +26547,7 @@ static int EncodeName(EncodedName* name, const char* nameStr,
             name->encoded[idx++] = nameTag;
             break;
     #endif
+    #ifdef WOLFSSL_CERT_REQ
         case ASN_CONTENT_TYPE:
             XMEMCPY(name->encoded + idx, attrPkcs9ContentTypeOid,
                     sizeof(attrPkcs9ContentTypeOid));
@@ -26549,6 +26555,7 @@ static int EncodeName(EncodedName* name, const char* nameStr,
             /* str type */
             name->encoded[idx++] = nameTag;
             break;
+    #endif
         default:
             name->encoded[idx++] = 0x55;
             name->encoded[idx++] = 0x04;
@@ -26621,10 +26628,12 @@ static int EncodeName(EncodedName* name, const char* nameStr,
                 oidSz = cname->custom.oidSz;
                 break;
         #endif
+        #ifdef WOLFSSL_CERT_REQ
             case ASN_CONTENT_TYPE:
                 oid = attrPkcs9ContentTypeOid;
                 oidSz = sizeof(attrPkcs9ContentTypeOid);
                 break;
+        #endif
             default:
                 /* Construct OID using type. */
                 dnOid[2] = type;