diff --git a/src/main/java/net/thauvin/erik/httpstatus/Utils.java b/src/main/java/net/thauvin/erik/httpstatus/Utils.java
index 2752b60..ed962d0 100644
--- a/src/main/java/net/thauvin/erik/httpstatus/Utils.java
+++ b/src/main/java/net/thauvin/erik/httpstatus/Utils.java
@@ -76,10 +76,10 @@ public final class Utils {
                     escaped.append("&");
                     break;
                 case '\'':
-                    escaped.append("'");
+                    escaped.append("'");
                     break;
                 case '"':
-                    escaped.append(""");
+                    escaped.append(""");
                     break;
                 default:
                     escaped.append(c);
diff --git a/src/test/java/net/thauvin/erik/httpstatus/UtilsTest.java b/src/test/java/net/thauvin/erik/httpstatus/UtilsTest.java
index 93bb6ff..6e0f485 100644
--- a/src/test/java/net/thauvin/erik/httpstatus/UtilsTest.java
+++ b/src/test/java/net/thauvin/erik/httpstatus/UtilsTest.java
@@ -53,8 +53,8 @@ public class UtilsTest {
         assertEquals(Utils.escapeXml(
                 "This is a test. We wan't to make sure that everything is <encoded> according the \"encoding\" "
                         + "parameter & value."),
-                "This is a test. We wan&#039;t to make sure that everything is &lt;encoded&gt; according the "
-                        + "&#034;encoding&#034; parameter &amp; value.");
+                "This is a test. We wan&apos;t to make sure that everything is &lt;encoded&gt; according the "
+                        + "&quot;encoding&quot; parameter &amp; value.");
     }
 
     @SuppressWarnings("PMD.AvoidDuplicateLiterals")
@@ -79,7 +79,7 @@ public class UtilsTest {
 
             sw.getBuffer().setLength(0);
             Utils.outWrite(sw, "wan't", "default", true);
-            assertEquals(sw.toString(), "wan&#039;t", "outWrite(wan't)");
+            assertEquals(sw.toString(), "wan&apos;t", "outWrite(wan't)");
 
             sw.getBuffer().setLength(0);
             Utils.outWrite(sw, null, "1 & 1", true);