diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
index 071e9c16..a5cf5b50 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
@@ -189,7 +189,7 @@ public class CSRBuilderTest {
         builder.addValue("CN", "firstcn.example.com");
         assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com");
         builder.addValue("CN", "scnd.example.com");
-        assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
+        assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,CN=scnd.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
         
         builder = new CSRBuilder();
         builder.addValue(BCStyle.C, "DE");
@@ -199,7 +199,7 @@ public class CSRBuilderTest {
         builder.addValue(BCStyle.CN, "firstcn.example.com");
         assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com");
         builder.addValue(BCStyle.CN, "scnd.example.com");
-        assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
+        assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,CN=scnd.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
     }
 
     private CSRBuilder createBuilderWithValues() throws UnknownHostException {
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java
index 9e4b0788..ca4c4da0 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java
@@ -228,7 +228,7 @@ public class CertificateUtilsTest {
                 notAfter, rootCert, rootKeypair.getPrivate());
 
         assertThat(cert.getIssuerX500Principal().getName()).isEqualTo(rootSubject);
-        assertThat(cert.getSubjectX500Principal().getName()).isEqualTo("CN=example.org");
+        assertThat(cert.getSubjectX500Principal().getName()).isEqualTo("");
         assertThat(getSANs(cert)).contains("example.org", "www.example.org");
         assertThat(getIpSANs(cert)).contains(InetAddress.getByName("192.168.0.1"));
         assertThat(cert.getNotBefore().toInstant()).isEqualTo(notBefore);