diff --git a/base/tools/src/main/java/com/netscape/cmstools/PKCS10Client.java b/base/tools/src/main/java/com/netscape/cmstools/PKCS10Client.java
index 35250c3707c..dd204213ee6 100644
--- a/base/tools/src/main/java/com/netscape/cmstools/PKCS10Client.java
+++ b/base/tools/src/main/java/com/netscape/cmstools/PKCS10Client.java
@@ -23,10 +23,6 @@
 import java.io.FileWriter;
 import java.io.PrintStream;
 import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.interfaces.DSAPublicKey;
-import java.security.interfaces.RSAPublicKey;
 
 import org.dogtagpki.nss.NSSDatabase;
 import org.dogtagpki.util.cert.CertUtil;
@@ -38,7 +34,6 @@
 import org.mozilla.jss.netscape.security.x509.Extensions;
 import org.mozilla.jss.netscape.security.x509.KeyIdentifier;
 import org.mozilla.jss.netscape.security.x509.SubjectKeyIdentifierExtension;
-import org.mozilla.jss.netscape.security.x509.X509Key;
 import org.mozilla.jss.util.Password;
 
 import com.netscape.cmsutil.crypto.CryptoUtil;
@@ -352,25 +347,11 @@ public static void main(String args[]) throws Exception {
                 extns.add(extn);
             }
 
-            PublicKey publicKey = pair.getPublic();
-            X509Key key = CryptoUtil.createX509Key(publicKey);
-
-            String algorithm;
-            if (publicKey instanceof RSAPublicKey) {
-                algorithm = "SHA256withRSA";
-            } else if (CryptoUtil.isECCKey(key)) {
-                algorithm = "SHA256withEC";
-            } else if (publicKey instanceof DSAPublicKey) {
-                algorithm = "DSA";
-            } else {
-                throw new NoSuchAlgorithmException("Unsupported algorithm: " + publicKey.getAlgorithm());
-            }
-
-            PKCS10 certReq = CryptoUtil.createPKCS10Request(
+            PKCS10 certReq = nssdb.createPKCS10Request(
+                    pair,
                     subjectName,
                     enable_encoding,
-                    pair,
-                    algorithm,
+                    "SHA256",
                     extns);
 
             if (verbose) {