diff --git a/src/da65/opc6502x.c b/src/da65/opc6502x.c
index 3bdc8a549..c5fb5888c 100644
--- a/src/da65/opc6502x.c
+++ b/src/da65/opc6502x.c
@@ -188,7 +188,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
     {   "nop",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
-    {   "xaa",  2,  flNone,                   OH_Immediate             }, /* $8b */
+    {   "ane",  2,  flNone,                   OH_Immediate             }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8d */
     {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8e */
@@ -196,7 +196,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
     {   "jam",  1,  flNone,                   OH_Implicit              }, /* $92 */
-    {   "ahx",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $93 */
+    {   "sha",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $93 */
     {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
     {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
     {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
@@ -208,7 +208,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "shy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "shx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9e */
-    {   "ahx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9f */
+    {   "sha",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9f */
     {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
     {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
diff --git a/test/asm/cpudetect/allinst.inc b/test/asm/cpudetect/allinst.inc
index d698a053e..c9abecc22 100644
--- a/test/asm/cpudetect/allinst.inc
+++ b/test/asm/cpudetect/allinst.inc
@@ -229,15 +229,15 @@ LABEL1:
     sax ($12,x)     ; $83
     sax $12         ; $87
     nop #$12        ; $89
-    ;xaa #$12        ; $8b  FIXME (implement in assembler)
+    ane #$12        ; $8b
     sax $1234       ; $8f
     jam             ; $92
-    ;ahx ($12),y     ; $93  FIXME (implement in assembler)
+    sha ($12),y     ; $93
     sax $12,y       ; $97
     tas $1234,y     ; $9b
     shy $1234,x     ; $9c
     shx $1234,y     ; $9e
-    ;ahx $1234,y     ; $9f  FIXME (implement in assembler)
+    sha $1234,y     ; $9f
     lax ($12,x)     ; $a3
     lax $12         ; $a7
     lax #$12        ; $ab
@@ -331,9 +331,10 @@ LABEL:
     lax $1234       ; $af
     lax ($12),y     ; $b3
     lax $12,y       ; $b7
-    las $1234,y     ; $bb
     lax $1234,y     ; $bf
 
+    las $1234,y     ; $bb
+
     alr #$12        ; $4b
 
     arr #$12        ; $6b