diff --git a/pom.xml b/pom.xml
index 7a9ef2d5..ebab4e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <mail-api.version>2.1.2</mail-api.version>
+        <angus-mail.version>2.0.2</angus-mail.version>
+
         <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
@@ -84,10 +88,18 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>2.0.1</version>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <version>${mail-api.version}</version>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
+            <version>${angus-mail.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/src/test/java/org/subethamail/smtp/BigAttachmentTest.java b/src/test/java/org/subethamail/smtp/BigAttachmentTest.java
index c8a38589..740e772a 100644
--- a/src/test/java/org/subethamail/smtp/BigAttachmentTest.java
+++ b/src/test/java/org/subethamail/smtp/BigAttachmentTest.java
@@ -34,7 +34,7 @@
 import org.subethamail.wiser.Wiser;
 import org.subethamail.wiser.WiserMessage;
 
-import com.sun.mail.smtp.SMTPTransport;
+import org.eclipse.angus.mail.smtp.SMTPTransport;
 
 /**
  * This class tests the transfer speed of emails that carry
diff --git a/src/test/java/org/subethamail/smtp/ErrorResponseTest.java b/src/test/java/org/subethamail/smtp/ErrorResponseTest.java
index 460794f2..32f2c042 100644
--- a/src/test/java/org/subethamail/smtp/ErrorResponseTest.java
+++ b/src/test/java/org/subethamail/smtp/ErrorResponseTest.java
@@ -28,7 +28,7 @@
 import org.subethamail.smtp.helper.BasicMessageListener;
 import org.subethamail.smtp.server.SMTPServer;
 
-import com.sun.mail.smtp.SMTPSendFailedException;
+import org.eclipse.angus.mail.smtp.SMTPSendFailedException;
 
 public class ErrorResponseTest {
 
diff --git a/src/test/java/org/subethamail/smtp/TestUtil.java b/src/test/java/org/subethamail/smtp/TestUtil.java
index b4da1c98..a315bd03 100644
--- a/src/test/java/org/subethamail/smtp/TestUtil.java
+++ b/src/test/java/org/subethamail/smtp/TestUtil.java
@@ -31,7 +31,7 @@
 
 import org.subethamail.util.ExtendedTrustManager;
 
-import com.sun.mail.util.MailSSLSocketFactory;
+import org.eclipse.angus.mail.util.MailSSLSocketFactory;
 
 class TestUtil {
 
@@ -86,8 +86,10 @@ static void send(TrustManager[] trustManagers, ConnectionType connectionType, St
         props.put("mail.smtp.port", PORT + "");
         if (connectionType == ConnectionType.START_TLS) {
             props.put("mail.smtp.starttls.enable", "true");
+            props.put("mail.smtp.ssl.checkserveridentity", "false");
         } else {
             props.put("mail.smtp.ssl.enable", "true");
+            props.put("mail.smtp.ssl.checkserveridentity", "false");
         }
         if (username != null) {
             props.setProperty("mail.smtp.submitter", username);