diff --git a/test/test_db.py b/test/test_db.py
index 678ab538ec..1fe7e9910a 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -50,14 +50,14 @@ def test_get_nick_id(db):
     nick = Identifier('Exirel')
     session = db.session()
 
-    # Attempt to get NickIDs: it is not created by default
+    # Attempt to get nick ID: it is not created by default
     with pytest.raises(ValueError):
         db.get_nick_id(nick)
 
-    # Create the NickIDs
+    # Create the nick ID
     nick_id = db.get_nick_id(nick, create=True)
 
-    # Check that one and only one Nicknames exist with that ID
+    # Check that one and only one nickname exists with that ID
     nickname = session.query(Nicknames).filter(
         Nicknames.nick_id == nick_id,
     ).one()  # will raise if not one and exactly one
@@ -80,7 +80,7 @@ def test_get_nick_id_casemapping(db, name, slug, variant):
     session = db.session()
     nick = Identifier(name)
 
-    # Create the NickIDs
+    # Create the nick ID
     nick_id = db.get_nick_id(nick, create=True)
 
     registered = session.query(Nicknames) \
@@ -96,12 +96,12 @@ def test_get_nick_id_casemapping(db, name, slug, variant):
     # Even if the case is different
     assert nick_id == db.get_nick_id(variant)
 
-    # And no other NickIDs was created (even with create=True)
+    # And no other nick IDs are created (even with create=True)
     assert nick_id == db.get_nick_id(name, create=True)
     assert nick_id == db.get_nick_id(variant, create=True)
     assert 1 == session.query(NickIDs).count()
 
-    # But a very different name means a new NickIDs
+    # But a truly different name means a new nick ID
     new_nick_id = db.get_nick_id(name + '_test', create=True)
     assert new_nick_id != nick_id
     assert 2 == session.query(NickIDs).count()