diff --git a/travis/test/apx.asm b/travis/test/apx.asm
index 244de71f0..f42dd6916 100644
--- a/travis/test/apx.asm
+++ b/travis/test/apx.asm
@@ -578,7 +578,8 @@ testcase	{0xF3, 0xD5, 0xCC, 0xB8, 0x0A},	{popcnt r25, [rdx]}
 ; legacy
 testcase	{0x0F, 0x32},					{rdmsr}
 ; apx
-testcase	{0x62, 0xDF, 0x7F, 0x08, 0xF6, 0xC1},		{rdmsr r25, 0xFFFF}
+testcase	{0x62, 0xDF, 0x7F, 0x08, 0xF6, 0xC1,\
+			0xFF, 0xFF, 0xFF, 0xFF},		{rdmsr r25, 0xFFFFFFFF}
 
 ; --- sttilecfg instruction ---
 ; legacy
@@ -648,7 +649,8 @@ testcase	{0x62, 0xDF, 0x7E, 0x08, 0xF8, 0xC2, 0xFF, 0xFF, 0xFF, 0xFF}, \
 ; legacy
 testcase	{0x0F, 0x01, 0xC6},			{wrmsrns}
 ; apx
-testcase	{0x62, 0xDF, 0x7E, 0x08, 0xF6, 0xC2},	{wrmsrns 0x100, r26}
+testcase	{0x62, 0xDF, 0x7E, 0x08, 0xF6, 0xC2,\
+			0x00, 0x01, 0x00, 0x00},	{wrmsrns 0x100, r26}
 
 ; --- wrssd/wrssq instructions ---
 ; legacy
diff --git a/travis/test/apx.bin.t b/travis/test/apx.bin.t
index 315f07e50..0cc3afd9f 100644
Binary files a/travis/test/apx.bin.t and b/travis/test/apx.bin.t differ
diff --git a/x86/insns.dat b/x86/insns.dat
index 3b08404b2..21364d1ef 100644
--- a/x86/insns.dat
+++ b/x86/insns.dat
@@ -463,9 +463,9 @@ $dq   MOV	reg_dreg,reg#			[rm:	nw w# 0f 23 /r]				386,PRIV,NOLONG
 
 WRMSR		void				[	0f 30]					PENT,PRIV,NOAPX
 RDMSR		void				[	0f 32]					PENT,PRIV,NOAPX
-RDMSR		rm64,imm32			[mi:	evex.nf0.128.f2.m7 f6 /0]		APX,PENT,PRIV
+RDMSR		rm64,imm32			[mi:	evex.nf0.128.f2.m7 f6 /0 id]		APX,PENT,PRIV
 WRMSRNS		void				[	np 0f 01 c6		]		WRMSRNS,PRIV,LONG
-WRMSRNS		imm32,reg64			[im:	evex.nf0.128.f3.m7 f6 /0]		APX,WRMSRNS,PRIV,LONG
+WRMSRNS		imm32,reg64			[im:	evex.nf0.128.f3.m7 f6 /0 id]		APX,WRMSRNS,PRIV,LONG
 RDMSRLIST	void				[	f2 0f 01 c6		]		MSRLIST,PRIV,LONG
 WRMSRLIST	void				[	f3 0f 01 c6		]		MSRLIST,PRIV,LONG