diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/UserIdTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/UserIdTest.java
index 78a5768f..2841a8d5 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/UserIdTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/UserIdTest.java
@@ -75,4 +75,15 @@ public class UserIdTest {
                         .withEmail("juliet@capulet.lit")
                         .toString());
     }
+
+    @Test
+    public void throwIfOnlyEmailEmailNull() {
+        assertThrows(IllegalArgumentException.class, () -> UserId.onlyEmail(null));
+    }
+
+    @Test
+    public void testNameAndEmail() {
+        UserId userId = UserId.nameAndEmail("Maurice Moss", "moss.m@reynholm.co.uk");
+        assertEquals("Maurice Moss <moss.m@reynholm.co.uk>", userId.toString());
+    }
 }