diff --git a/t/real/nkjp.t b/t/real/nkjp.t
index aa9f5df..66ed637 100644
--- a/t/real/nkjp.t
+++ b/t/real/nkjp.t
@@ -100,7 +100,9 @@
 like($token, qr!<>:dereko\/s:seg\$<b>64!);
 like($token, qr!i:ładu!);
 like($token, qr!nkjp\/l:ład!);
-like($token, qr!nkjp\/m:sg:gen:m3!);
+like($token, qr!nkjp\/m:number:sg!);
+like($token, qr!nkjp\/m:case:gen!);
+like($token, qr!nkjp\/m:gender:m3!);
 like($token, qr!nkjp\/p:subst!);
 like($token, qr!s:ładu!);
 
@@ -170,7 +172,10 @@
 like($token, qr!_5\$<i>23<i>28!);
 like($token, qr!i:takie!);
 like($token, qr!nkjp/l:taki!);
-like($token, qr!nkjp/m:sg:nom:n:pos!);
+like($token, qr!nkjp/m:number:sg!);
+like($token, qr!nkjp/m:case:nom!);
+like($token, qr!nkjp/m:gender:n!);
+like($token, qr!nkjp/m:degree:pos!);
 like($token, qr!nkjp/p:adj!);
 like($token, qr!s:takie!);
 like($token, qr!nkjp/ov:takie!);
@@ -185,7 +190,9 @@
 like($token, qr!_67\$<i>464<i>475!);
 like($token, qr!i:kierkegaard!);
 like($token, qr!nkjp/l:Kierkegaard!);
-like($token, qr!nkjp/m:sg:nom:m1!);
+like($token, qr!nkjp/m:number:sg!);
+like($token, qr!nkjp/m:case:nom!);
+like($token, qr!nkjp/m:gender:m1!);
 like($token, qr!nkjp/ne:persName:surname!);
 like($token, qr!nkjp/p:subst!);
 like($token, qr!s:Kierkegaard!);