diff --git a/unittests/InstructionCountCI/FlagM/VEX_map_group.json b/unittests/InstructionCountCI/FlagM/VEX_map_group.json
index 14646f118c..73d0168087 100644
--- a/unittests/InstructionCountCI/FlagM/VEX_map_group.json
+++ b/unittests/InstructionCountCI/FlagM/VEX_map_group.json
@@ -44,7 +44,7 @@
       ]
     },
     "blsmsk eax, ebx": {
-      "ExpectedInstructionCount": 13,
+      "ExpectedInstructionCount": 8,
       "Comment": [
         "Map group 17 0b010 32-bit"
       ],
@@ -53,34 +53,24 @@
         "sub x21, x20, #0x1 (1)",
         "eor x21, x21, x20",
         "mov w4, w21",
-        "mov w22, #0x50000000",
-        "mrs x23, nzcv",
-        "bic x22, x23, x22",
         "cmp x20, #0x0 (0)",
         "cset x20, eq",
-        "msr nzcv, x22",
-        "rmif x20, #63, #nzCv",
-        "lsr w20, w21, #31",
-        "rmif x20, #61, #Nzcv"
+        "tst w21, w21",
+        "rmif x20, #63, #nzCv"
       ]
     },
     "blsmsk rax, rbx": {
-      "ExpectedInstructionCount": 11,
+      "ExpectedInstructionCount": 6,
       "Comment": [
         "Map group 17 0b010 64-bit"
       ],
       "ExpectedArm64ASM": [
         "sub x20, x7, #0x1 (1)",
         "eor x4, x20, x7",
-        "mov w20, #0x50000000",
-        "mrs x21, nzcv",
-        "bic x20, x21, x20",
         "cmp x7, #0x0 (0)",
-        "cset x21, eq",
-        "msr nzcv, x20",
-        "rmif x21, #63, #nzCv",
-        "lsr x20, x4, #63",
-        "rmif x20, #61, #Nzcv"
+        "cset x20, eq",
+        "tst x4, x4",
+        "rmif x20, #63, #nzCv"
       ]
     },
     "blsi eax, ebx": {
diff --git a/unittests/InstructionCountCI/VEX_map_group.json b/unittests/InstructionCountCI/VEX_map_group.json
index ebc6f16754..57796af6ae 100644
--- a/unittests/InstructionCountCI/VEX_map_group.json
+++ b/unittests/InstructionCountCI/VEX_map_group.json
@@ -643,7 +643,7 @@
       ]
     },
     "blsmsk eax, ebx": {
-      "ExpectedInstructionCount": 15,
+      "ExpectedInstructionCount": 10,
       "Comment": [
         "Map group 17 0b010 32-bit"
       ],
@@ -652,35 +652,27 @@
         "sub x21, x20, #0x1 (1)",
         "eor x21, x21, x20",
         "mov w4, w21",
-        "mov w22, #0x50000000",
-        "mrs x23, nzcv",
-        "bic x22, x23, x22",
         "cmp x20, #0x0 (0)",
         "cset x20, eq",
-        "mov w0, w22",
-        "bfi w0, w20, #29, #1",
-        "mov w20, w0",
-        "lsr w21, w21, #31",
-        "bfi w20, w21, #31, #1",
+        "tst w21, w21",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
     "blsmsk rax, rbx": {
-      "ExpectedInstructionCount": 11,
+      "ExpectedInstructionCount": 8,
       "Comment": [
         "Map group 17 0b010 64-bit"
       ],
       "ExpectedArm64ASM": [
         "sub x20, x7, #0x1 (1)",
         "eor x4, x20, x7",
-        "mov w20, #0x50000000",
-        "mrs x21, nzcv",
-        "bic x20, x21, x20",
         "cmp x7, #0x0 (0)",
-        "cset x21, eq",
-        "bfi w20, w21, #29, #1",
-        "lsr x21, x4, #63",
-        "bfi w20, w21, #31, #1",
+        "cset x20, eq",
+        "tst x4, x4",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },