diff --git a/certs/test/gen-testcerts.sh b/certs/test/gen-testcerts.sh
index 264408942..1d254d788 100755
--- a/certs/test/gen-testcerts.sh
+++ b/certs/test/gen-testcerts.sh
@@ -36,9 +36,7 @@ build_test_cert_conf() {
     echo "prompt = no"                                  >> "$1".conf
     echo "default_bits        = 2048"                   >> "$1".conf
     echo "distinguished_name  = req_distinguished_name" >> "$1".conf
-    if [ -n "$3" ]; then
-        echo "req_extensions      = req_ext"            >> "$1".conf
-    fi
+    echo "req_extensions      = req_ext"                >> "$1".conf
     if [ -n "$4" ]; then
         echo "basicConstraints=CA:true,pathlen:0"       >> "$1".conf
         echo ""                                         >> "$1".conf
@@ -52,8 +50,8 @@ build_test_cert_conf() {
     echo "CN = $2"                                      >> "$1".conf
     echo "emailAddress = info@wolfssl.com"              >> "$1".conf
     echo ""                                             >> "$1".conf
+    echo "[ req_ext ]"                                  >> "$1".conf
     if [ -n "$3" ]; then
-        echo "[ req_ext ]"                              >> "$1".conf
         case "$3" in
             *DER*)
                echo "subjectAltName = $3"               >> "$1".conf
@@ -64,6 +62,8 @@ build_test_cert_conf() {
                echo "DNS.1 = $3"                        >> "$1".conf
                ;;
         esac
+    else
+        echo "subjectKeyIdentifier = hash"              >> "$1".conf
     fi
 }
 
@@ -85,15 +85,9 @@ generate_test_cert() {
     check_result $?
 
     echo "step 4 create cert"
-    if [ "$3" = "" ]; then
-        openssl x509 -req -days 1000 -sha256 \
-                     -in "$1".csr -signkey ../server-key.pem \
-                     -out "$1".pem -extfile "$1".conf
-    else
-        openssl x509 -req -days 1000 -sha256 \
-                     -in "$1".csr -signkey ../server-key.pem \
-                     -out "$1".pem -extensions req_ext -extfile "$1".conf
-    fi
+    openssl x509 -req -days 1000 -sha256 \
+                 -in "$1".csr -signkey ../server-key.pem \
+                 -out "$1".pem -extensions req_ext -extfile "$1".conf
     check_result $?
     rm "$1".conf
     rm "$1".csr