diff --git a/ssl/Config.in b/ssl/Config.in
index 804441861..e66ab7ca3 100644
--- a/ssl/Config.in
+++ b/ssl/Config.in
@@ -225,7 +225,6 @@ config CONFIG_SSL_USE_PKCS12
     bool "Use PKCS8/PKCS12"
     default n if !CONFIG_SSL_FULL_MODE
     default y if CONFIG_SSL_FULL_MODE
-#    depends on !CONFIG_SSL_SERVER_ONLY && !CONFIG_SSL_SKELETON_MODE
     help
         PKCS#12 certificates combine private keys and certificates together in
         one file.
diff --git a/ssl/test/ssltest.c b/ssl/test/ssltest.c
index 4dd1fca47..65c25c5b7 100644
--- a/ssl/test/ssltest.c
+++ b/ssl/test/ssltest.c
@@ -1233,13 +1233,21 @@ int SSL_server_tests(void)
         goto cleanup;
 
     /*
-     * PKCS#8 key (unencrypted)
+     * PKCS#8 key (unencrypted DER format)
      */
-    if ((ret = SSL_server_test("pkcs#8 unencrypted", "-cipher RC4-SHA", 
+    if ((ret = SSL_server_test("pkcs#8 DER unencrypted", "-cipher RC4-SHA", 
                 DEFAULT_CERT, NULL, "../ssl/test/axTLS.unencrypted.p8", 
                 NULL, NULL, DEFAULT_SVR_OPTION)))
         goto cleanup;
 
+    /*
+     * PKCS#8 key (unencrypted PEM format)
+     */
+    if ((ret = SSL_server_test("pkcs#8 PEM unencrypted", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.unencrypted_pem.p8", 
+                NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
     /*
      * PKCS#12 key/certificate
      */