diff --git a/programs/ssl/test-ca/sslconf.txt b/programs/ssl/test-ca/sslconf.txt
index 94e59545d..e7901b17f 100644
--- a/programs/ssl/test-ca/sslconf.txt
+++ b/programs/ssl/test-ca/sslconf.txt
@@ -25,9 +25,12 @@ policy                  = my_policy
 x509_extensions         = v3_usr
 
 [ my_policy ]
-countryName             = match
+countryName             = optional
+stateOrProvinceName     = optional
 organizationName        = match
+organizationalUnitName  = optional
 commonName              = supplied
+emailAddress            = optional
 
 [ req ]
 distinguished_name      = my_req_dn
@@ -35,11 +38,16 @@ x509_extensions         = v3_ca
 
 [ my_req_dn ]
 countryName             = Country Name..............
-countryName_default		= NL
-organizationName      = Organization Name.........
-organizationName_default = PolarSSL
+countryName_min         = 2
+countryName_max         = 2
+stateOrProvinceName     = State or Province Name....
+localityName            = Locality Name.............
+0.organizationName      = Organization Name.........
+organizationalUnitName  = Org. Unit Name............
 commonName              = Common Name (required)....
 commonName_max          = 64
+emailAddress            = Email Address.............
+emailAddress_max        = 64
 
 [ v3_ca ]
 basicConstraints        = CA:TRUE
@@ -50,3 +58,4 @@ authorityKeyIdentifier  = keyid:always,issuer:always
 basicConstraints        = CA:FALSE
 subjectKeyIdentifier    = hash
 authorityKeyIdentifier  = keyid,issuer
+