diff --git a/projects/angus-mail/ASCIIUtilityFuzzer.java b/projects/angus-mail/ASCIIUtilityFuzzer.java
index 815f53c01..478a98d7d 100644
--- a/projects/angus-mail/ASCIIUtilityFuzzer.java
+++ b/projects/angus-mail/ASCIIUtilityFuzzer.java
@@ -17,9 +17,10 @@
 
 import com.code_intelligence.jazzer.api.FuzzedDataProvider;
 
-import com.sun.mail.util.ASCIIUtility;
 import java.lang.NumberFormatException;
 
+import org.eclipse.angus.mail.util.ASCIIUtility;
+
 public class ASCIIUtilityFuzzer {
   public static void fuzzerTestOneInput(FuzzedDataProvider data) {
     byte[] input = data.consumeRemainingAsBytes();
diff --git a/projects/angus-mail/BASE64EncoderStreamFuzzer.java b/projects/angus-mail/BASE64EncoderStreamFuzzer.java
index 7f066510c..352ccdff8 100644
--- a/projects/angus-mail/BASE64EncoderStreamFuzzer.java
+++ b/projects/angus-mail/BASE64EncoderStreamFuzzer.java
@@ -16,11 +16,13 @@
 
 import com.code_intelligence.jazzer.api.FuzzedDataProvider;
 
-import com.sun.mail.util.BASE64EncoderStream;
 import java.lang.NumberFormatException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import org.eclipse.angus.mail.util.BASE64EncoderStream;
+import org.eclipse.angus.mail.util.ASCIIUtility;
+
 public class BASE64EncoderStreamFuzzer {
   public static void fuzzerTestOneInput(FuzzedDataProvider data) {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();