diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/JUnitToAssertJRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/JUnitToAssertJRules.java
index ef36f054..59f3e68d 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/JUnitToAssertJRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/JUnitToAssertJRules.java
@@ -521,7 +521,7 @@ final class JUnitToAssertJRules {
 
   static final class AssertThatByteIsEqualTo {
     @BeforeTemplate
-    void before (byte actual, byte expected) {
+    void before(byte actual, byte expected) {
       assertEquals(actual, expected);
     }
 
@@ -532,9 +532,9 @@ final class JUnitToAssertJRules {
     }
   }
 
-  static final class AssertThatByteIsEqualToWithMessage {
+  static final class AssertThatByteWithFailMessageStringIsEqualTo {
     @BeforeTemplate
-    void before (byte actual, byte expected, String message) {
+    void before(byte actual, byte expected, String message) {
       assertEquals(actual, expected, message);
     }
 
@@ -544,4 +544,56 @@ final class JUnitToAssertJRules {
       assertThat(actual).withFailMessage(message).isEqualTo(expected);
     }
   }
+
+  static final class AssertThatByteWithFailMessageSupplierIsEqualTo {
+    @BeforeTemplate
+    void before(byte actual, byte expected, Supplier<String> message) {
+      assertEquals(actual, expected, message);
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    void after(byte actual, byte expected, Supplier<String> message) {
+      assertThat(actual).withFailMessage(message).isEqualTo(expected);
+    }
+  }
+
+  static final class AssertThatCharIsEqualTo {
+    @BeforeTemplate
+    void before(char actual, char expected) {
+      assertEquals(actual, expected);
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    void after(char actual, char expected) {
+      assertThat(actual).isEqualTo(expected);
+    }
+  }
+
+  static final class AssertThatCharWithFailMessageStringIsEqualTo {
+    @BeforeTemplate
+    void before(char actual, char expected, String message) {
+      assertEquals(actual, expected, message);
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    void after(char actual, char expected, String message) {
+      assertThat(actual).withFailMessage(message).isEqualTo(expected);
+    }
+  }
+
+  static final class AssertThatCharWithFailMessageSupplierIsEqualTo {
+    @BeforeTemplate
+    void before(char actual, char expected, Supplier<String> message) {
+      assertEquals(actual, expected, message);
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    void after(char actual, char expected, Supplier<String> message) {
+      assertThat(actual).withFailMessage(message).isEqualTo(expected);
+    }
+  }
 }
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java
index cbf5e22f..3713419a 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java
@@ -31,7 +31,9 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
         (Runnable) () -> assertNull(null),
         (Runnable) () -> assertSame(null, null),
         (Runnable) () -> assertTrue(true),
-        (Runnable) () -> assertEquals(0, 0));
+        (Runnable) () -> assertEquals(0, 0),
+        (Runnable) () -> assertEquals(0, 0, "foo"),
+        (Runnable) () -> assertEquals(0, 0, () -> "foo"));
   }
 
   void testThrowNewAssertionError() {
@@ -173,7 +175,27 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
     assertInstanceOf(Object.class, new Object(), () -> "foo");
   }
 
-  void testAssertThatIsEqualTo() {
+  void testAssertThatByteIsEqualTo() {
     assertEquals((byte) 0, (byte) 0);
   }
+
+  void testAssertThatByteWithFailMessageStringIsEqualTo() {
+    assertEquals((byte) 0, (byte) 0, "foo");
+  }
+
+  void testAssertThatByteWithFailMessageSupplierIsEqualTo() {
+    assertEquals((byte) 0, (byte) 0, () -> "foo");
+  }
+
+  void testAssertThatCharIsEqualTo() {
+    assertEquals('a', 'a');
+  }
+
+  void testAssertThatCharWithFailMessageStringIsEqualTo() {
+    assertEquals('a', 'a', "foo");
+  }
+
+  void testAssertThatCharWithFailMessageSupplierIsEqualTo() {
+    assertEquals('a', 'a', () -> "foo");
+  }
 }
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java
index 32a9f5c8..0f755803 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java
@@ -35,7 +35,9 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
         (Runnable) () -> assertNull(null),
         (Runnable) () -> assertSame(null, null),
         (Runnable) () -> assertTrue(true),
-        (Runnable) () -> assertEquals(0, 0));
+        (Runnable) () -> assertEquals(0, 0),
+        (Runnable) () -> assertEquals(0, 0, "foo"),
+        (Runnable) () -> assertEquals(0, 0, () -> "foo"));
   }
 
   void testThrowNewAssertionError() {
@@ -183,7 +185,27 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
     assertThat(new Object()).withFailMessage(() -> "foo").isInstanceOf(Object.class);
   }
 
-  void testAssertThatIsEqualTo() {
+  void testAssertThatByteIsEqualTo() {
     assertThat((byte) 0).isEqualTo((byte) 0);
   }
+
+  void testAssertThatByteWithFailMessageStringIsEqualTo() {
+    assertThat((byte) 0).withFailMessage("foo").isEqualTo((byte) 0);
+  }
+
+  void testAssertThatByteWithFailMessageSupplierIsEqualTo() {
+    assertThat((byte) 0).withFailMessage(() -> "foo").isEqualTo((byte) 0);
+  }
+
+  void testAssertThatCharIsEqualTo() {
+    assertThat('a').isEqualTo('a');
+  }
+
+  void testAssertThatCharWithFailMessageStringIsEqualTo() {
+    assertThat('a').withFailMessage("foo").isEqualTo('a');
+  }
+
+  void testAssertThatCharWithFailMessageSupplierIsEqualTo() {
+    assertThat('a').withFailMessage(() -> "foo").isEqualTo('a');
+  }
 }