diff a/test/jdk/sun/security/ec/ed/TestEdDSA.java b/test/jdk/sun/security/ec/ed/TestEdDSA.java
--- a/test/jdk/sun/security/ec/ed/TestEdDSA.java
+++ b/test/jdk/sun/security/ec/ed/TestEdDSA.java
@@ -114,35 +114,35 @@
             "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
             "dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b589" +
             "09351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704");
 
         // Ed25519ctx
-        byte[] context = Convert.hexStringToByteArray("666f6f");
+        byte[] context = Hex.decoder().decode("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
             "f726936d19c800494e3fdaff20b276a8",
             "55a4cc2f70a54e04288c5f4cd1e45a7bb520b36292911876cada7323198dd87a" +
             "8b36950b95130022907a7fb7c4e9b2d5f6cca685a587b4b21f4b888e4e7edb0d");
 
-       context = Convert.hexStringToByteArray("626172");
+       context = Hex.decoder().decode("626172");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
             "f726936d19c800494e3fdaff20b276a8",
             "fc60d5872fc46b3aa69f8b5b4351d5808f92bcc044606db097abab6dbcb1aee3" +
             "216c48e8b3b66431b5b186d1d28f8ee15a5ca2df6668346291c2043d4eb3e90d");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = Hex.decoder().decode("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
             "508e9e6882b979fea900f62adceaca35",
             "8b70c1cc8310e1de20ac53ce28ae6e7207f33c3295e03bb5c0732a1d20dc6490" +
             "8922a8b052cf99b7c4fe107a5abb5b2c4085ae75890d02df26269d8945f84b0b");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = Hex.decoder().decode("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "ab9c2853ce297ddab85c993b3ae14bcad39b2c682beabc27d6d4eb20711d6560",
             "0f1d1274943b91415889152e893d80e93275a1fc0b65fd71b4b0dda10ad7d772",
             "f726936d19c800494e3fdaff20b276a8",
             "21655b5f1aa965996b3f97b3c849eafba922a0a62992f73b3d1b73106a84ad85" +
@@ -177,11 +177,11 @@
             "26b8f91727bd62897af15e41eb43c377efb9c610d48f2335cb0bd0087810f435" +
             "2541b143c4b981b7e18f62de8ccdf633fc1bf037ab7cd779805e0dbcc0aae1cb" +
             "cee1afb2e027df36bc04dcecbf154336c19f0af7e0a6472905e799f1953d2a0f" +
             "f3348ab21aa4adafd1d234441cf807c03a00");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = Hex.decoder().decode("666f6f");
         runSignTest("Ed448", new EdDSAParameterSpec(false, context),
             "c4eab05d357007c632f3dbb48489924d552b08fe0c353a0d4a1f00acda2c463a" +
             "fbea67c5e8d2877c5e3bc397a659949ef8021e954e0a12274e",
             "43ba28f430cdff456ae531545f7ecd0ac834a55d9358c0372bfa0c6c6798c086" +
             "6aea01eb00742802b8438ea4cb82169c235160627b4c3a9480",
@@ -323,13 +323,13 @@
 
     private static void runSignTest(String algorithm,
             AlgorithmParameterSpec params, String privateKey, String publicKey,
             String message, String signature) throws Exception {
 
-        byte[] privKeyBytes = Convert.hexStringToByteArray(privateKey);
+        byte[] privKeyBytes = Hex.decoder().decode(privateKey);
         EdECPoint pubKeyPoint = Convert.hexStringToEdPoint(publicKey);
-        byte[] msgBytes = Convert.hexStringToByteArray(message);
+        byte[] msgBytes = Hex.decoder().decode(message);
         byte[] computedSig;
 
         NamedParameterSpec namedSpec = new NamedParameterSpec(algorithm);
         EdECPrivateKeySpec privKeySpec =
             new EdECPrivateKeySpec(namedSpec, privKeyBytes);
@@ -340,12 +340,11 @@
             sig.setParameter(params);
         }
         sig.initSign(privKey);
         sig.update(msgBytes);
         computedSig = sig.sign();
-        if (!Arrays.equals(computedSig,
-            Convert.hexStringToByteArray(signature))) {
+        if (!Arrays.equals(computedSig, Hex.decoder().decode(signature))) {
             throw new RuntimeException("Incorrect signature");
         }
 
         // test verification
         sig = Signature.getInstance(algorithm);