diff --git a/tests/constants.py b/tests/constants.py
index 6924129..15ce0c9 100644
--- a/tests/constants.py
+++ b/tests/constants.py
@@ -9,15 +9,17 @@ INCOMING_MSG = 2
 ANGLE_ADDR = "<{}>"
 NAME_ADDR = "{} {}"
 
-BOB_NAME = "Bob Babagge"
-BOB_ADDRESS = "bob@openpgp.example"
-BOB_FPR = "D1A66E1A23B182C9980F788CFBFCC82A015E7330"
-BOB_NAME_ADDR = NAME_ADDR.format(BOB_NAME, ANGLE_ADDR.format(BOB_ADDRESS))
-
-ALICE_NAME = "Alice Lovelace"
+ALICE_USERNAME = "Alice Lovelace"
 ALICE_ADDRESS = "alice@openpgp.example"
+ALICE_ID = 23
 ALICE_FPR = "EB85BB5FA33A75E15E944E63F231550C4F47E38E"
-ALICE_NAME_ADDR = NAME_ADDR.format(ALICE_NAME, ANGLE_ADDR.format(ALICE_ADDRESS))
+ALICE_NAME_ADDR = NAME_ADDR.format(ALICE_USERNAME, ANGLE_ADDR.format(ALICE_ADDRESS))
+
+BOB_USERNAME = "Bob Babagge"
+BOB_ADDRESS = "bob@openpgp.example"
+BOB_ID = 23
+BOB_FPR = "D1A66E1A23B182C9980F788CFBFCC82A015E7330"
+BOB_NAME_ADDR = NAME_ADDR.format(BOB_USERNAME, ANGLE_ADDR.format(BOB_ADDRESS))
 
 SUBJECT = "This is a subject"
 BODY = "Hi world!\n"