diff --git a/unittests/ASM/VEX/vgather_dpd_128bit_1xdisp.asm b/unittests/ASM/VEX/vgather_dpd_128bit_1xdisp.asm
index 75a9a076d..b7686966c 100644
--- a/unittests/ASM/VEX/vgather_dpd_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_128bit_2xdisp.asm b/unittests/ASM/VEX/vgather_dpd_128bit_2xdisp.asm
index 3b451eb4c..1aa24ade5 100644
--- a/unittests/ASM/VEX/vgather_dpd_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_128bit_4xdisp.asm b/unittests/ASM/VEX/vgather_dpd_128bit_4xdisp.asm
index 5cd48404f..1616c764e 100644
--- a/unittests/ASM/VEX/vgather_dpd_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_128bit_8xdisp.asm b/unittests/ASM/VEX/vgather_dpd_128bit_8xdisp.asm
index 1f51a9e35..ffd3e2e87 100644
--- a/unittests/ASM/VEX/vgather_dpd_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_256bit_1xdisp.asm b/unittests/ASM/VEX/vgather_dpd_256bit_1xdisp.asm
index 554f1f350..66dd04d9d 100644
--- a/unittests/ASM/VEX/vgather_dpd_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_256bit_2xdisp.asm b/unittests/ASM/VEX/vgather_dpd_256bit_2xdisp.asm
index 2f9ce2df0..c4b514698 100644
--- a/unittests/ASM/VEX/vgather_dpd_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_256bit_4xdisp.asm b/unittests/ASM/VEX/vgather_dpd_256bit_4xdisp.asm
index 228788200..1594528f7 100644
--- a/unittests/ASM/VEX/vgather_dpd_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dpd_256bit_8xdisp.asm b/unittests/ASM/VEX/vgather_dpd_256bit_8xdisp.asm
index 720a19f14..8c77b8ee4 100644
--- a/unittests/ASM/VEX/vgather_dpd_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dpd_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_128bit_1xdisp.asm b/unittests/ASM/VEX/vgather_dps_128bit_1xdisp.asm
index 35870b0ea..1ccd3eb43 100644
--- a/unittests/ASM/VEX/vgather_dps_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_128bit_2xdisp.asm b/unittests/ASM/VEX/vgather_dps_128bit_2xdisp.asm
index aa39d9ead..1f081d2b4 100644
--- a/unittests/ASM/VEX/vgather_dps_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_128bit_4xdisp.asm b/unittests/ASM/VEX/vgather_dps_128bit_4xdisp.asm
index c4dd47727..4c9a36738 100644
--- a/unittests/ASM/VEX/vgather_dps_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_128bit_8xdisp.asm b/unittests/ASM/VEX/vgather_dps_128bit_8xdisp.asm
index f229dc7dc..564faa26c 100644
--- a/unittests/ASM/VEX/vgather_dps_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_256bit_1xdisp.asm b/unittests/ASM/VEX/vgather_dps_256bit_1xdisp.asm
index 775bb6574..f3198e0e8 100644
--- a/unittests/ASM/VEX/vgather_dps_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_256bit_1xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_256bit_2xdisp.asm b/unittests/ASM/VEX/vgather_dps_256bit_2xdisp.asm
index 0ab12b5c1..b682ec5c9 100644
--- a/unittests/ASM/VEX/vgather_dps_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_256bit_2xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_256bit_4xdisp.asm b/unittests/ASM/VEX/vgather_dps_256bit_4xdisp.asm
index a7fef7f9a..c090be7db 100644
--- a/unittests/ASM/VEX/vgather_dps_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_256bit_4xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_dps_256bit_8xdisp.asm b/unittests/ASM/VEX/vgather_dps_256bit_8xdisp.asm
index 368f8d478..615b88108 100644
--- a/unittests/ASM/VEX/vgather_dps_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_dps_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp.asm b/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp.asm
index 51ca58a9d..5589df096 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp_overflow.asm
index 007c82c94..2fea20a1b 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp.asm b/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp.asm
index 3eff5266b..1888a1bbd 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp_overflow.asm
index ca8d74587..2386a7757 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp.asm b/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp.asm
index ecaaa2974..0b0a7ce12 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp_overflow.asm
index 48bbf8ef9..76dd9c9d7 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp.asm b/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp.asm
index d052a5304..c2fb4fb0c 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp_overflow.asm
index 6dbd1c3bf..4e8c9feb1 100644
--- a/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_128bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp.asm b/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp.asm
index 61b10742c..9eb046a52 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp_overflow.asm
index 063b46a77..a1302a973 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp.asm b/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp.asm
index b7d70e1b1..1634fd67e 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp_overflow.asm
index 3608fa58c..2b90af167 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp.asm b/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp.asm
index 9608a3576..b7af9925f 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp_overflow.asm
index af14c9cb1..c1275328d 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp.asm b/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp.asm
index 6b83c476f..15ccb7360 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp_overflow.asm
index 38632efa5..dfb827009 100644
--- a/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qpd_256bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_1xdisp.asm b/unittests/ASM/VEX/vgather_qps_128bit_1xdisp.asm
index 3ba858b68..7fee22bbf 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_128bit_1xdisp_overflow.asm
index 5d4539d76..e438cbcc1 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_2xdisp.asm b/unittests/ASM/VEX/vgather_qps_128bit_2xdisp.asm
index 1cfdc665c..0f295cc2a 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_128bit_2xdisp_overflow.asm
index 3094b6a52..53c72e187 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_4xdisp.asm b/unittests/ASM/VEX/vgather_qps_128bit_4xdisp.asm
index 0579a16d4..0248517d2 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_128bit_4xdisp_overflow.asm
index c08400fc1..06e36b3bb 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_8xdisp.asm b/unittests/ASM/VEX/vgather_qps_128bit_8xdisp.asm
index 497030ebe..56f1c1ab5 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_128bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_128bit_8xdisp_overflow.asm
index bdb533de8..a17bc773e 100644
--- a/unittests/ASM/VEX/vgather_qps_128bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_128bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_1xdisp.asm b/unittests/ASM/VEX/vgather_qps_256bit_1xdisp.asm
index 588c6373b..5c28372f3 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_256bit_1xdisp_overflow.asm
index 5a2a22b34..bed42324f 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_2xdisp.asm b/unittests/ASM/VEX/vgather_qps_256bit_2xdisp.asm
index e85309ffb..5618673ba 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_256bit_2xdisp_overflow.asm
index 5210da67e..7ca66cf90 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_4xdisp.asm b/unittests/ASM/VEX/vgather_qps_256bit_4xdisp.asm
index f95317194..995f1fbb3 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_256bit_4xdisp_overflow.asm
index e147c8538..24ac6fb5d 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_8xdisp.asm b/unittests/ASM/VEX/vgather_qps_256bit_8xdisp.asm
index 298acca42..a8ee9572c 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vgather_qps_256bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vgather_qps_256bit_8xdisp_overflow.asm
index 7dfae8636..cef69844b 100644
--- a/unittests/ASM/VEX/vgather_qps_256bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vgather_qps_256bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_128bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_dd_128bit_1xdisp.asm
index 1adfb2b80..24d164a96 100644
--- a/unittests/ASM/VEX/vpgather_dd_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_128bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_dd_128bit_2xdisp.asm
index c625c079e..72bf6a326 100644
--- a/unittests/ASM/VEX/vpgather_dd_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_128bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_dd_128bit_4xdisp.asm
index bf5f551db..d714dc4c8 100644
--- a/unittests/ASM/VEX/vpgather_dd_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_128bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_dd_128bit_8xdisp.asm
index a69cbac62..2fb81e2a0 100644
--- a/unittests/ASM/VEX/vpgather_dd_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_256bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_dd_256bit_1xdisp.asm
index 6e0b2d1f7..75204e748 100644
--- a/unittests/ASM/VEX/vpgather_dd_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_256bit_1xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_256bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_dd_256bit_2xdisp.asm
index 21a61da4a..268e372e6 100644
--- a/unittests/ASM/VEX/vpgather_dd_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_256bit_2xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_256bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_dd_256bit_4xdisp.asm
index c069645c1..aa6a54a4e 100644
--- a/unittests/ASM/VEX/vpgather_dd_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_256bit_4xdisp.asm
@@ -17,7 +17,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dd_256bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_dd_256bit_8xdisp.asm
index 69cfdba8b..c822ebf7d 100644
--- a/unittests/ASM/VEX/vpgather_dd_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dd_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_128bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_dq_128bit_1xdisp.asm
index 6b875b5cd..005ba6b58 100644
--- a/unittests/ASM/VEX/vpgather_dq_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_128bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_dq_128bit_2xdisp.asm
index 84ee05758..6d1011e28 100644
--- a/unittests/ASM/VEX/vpgather_dq_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_128bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_dq_128bit_4xdisp.asm
index f189fe8eb..b07c3822e 100644
--- a/unittests/ASM/VEX/vpgather_dq_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_128bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_dq_128bit_8xdisp.asm
index 32d74f6be..915f055b4 100644
--- a/unittests/ASM/VEX/vpgather_dq_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_256bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_dq_256bit_1xdisp.asm
index 447b5cb06..5859e2882 100644
--- a/unittests/ASM/VEX/vpgather_dq_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_256bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_dq_256bit_2xdisp.asm
index ab50346d0..762a89269 100644
--- a/unittests/ASM/VEX/vpgather_dq_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_256bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_dq_256bit_4xdisp.asm
index 04cabf231..64620c876 100644
--- a/unittests/ASM/VEX/vpgather_dq_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_dq_256bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_dq_256bit_8xdisp.asm
index 393c15ed7..a0e03814f 100644
--- a/unittests/ASM/VEX/vpgather_dq_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_dq_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp.asm
index dc325cf87..04f126fc4 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp_overflow.asm
index 4647395a1..924fbad29 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp.asm
index fbaad7b94..799280153 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp_overflow.asm
index 13954dfe3..ed7c74aca 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp.asm
index 351fdfac4..68abecb39 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp_overflow.asm
index 798b59d14..ead1c1112 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp.asm
index a63260365..a420b53e4 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp_overflow.asm
index 0e5167bc7..5b232c17d 100644
--- a/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_128bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp.asm
index 5e0d798cd..184060acd 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp_overflow.asm
index 332ab3a14..f03b4253a 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp.asm
index 659748e71..09d268735 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp_overflow.asm
index ea2bc3aa5..9629b567f 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp.asm
index 1200ea622..36042c511 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp_overflow.asm
index 92f1ed9fa..fa8ce7958 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp.asm
index 1e51c4c43..4e6a620b6 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp_overflow.asm
index c17a46650..71a925dc8 100644
--- a/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qd_256bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x7f80d2ec6135a9d7", "0x8a34fff5db698176", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp.asm
index b622634af..d8be16cfb 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp_overflow.asm
index a8188228c..62ff7b924 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp.asm
index eccd4296e..62f246ec0 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp_overflow.asm
index 3999f270b..ca8d2f9e3 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp.asm
index 3d5c83bda..9fea1afef 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp_overflow.asm
index c867bf48b..e93af9335 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp.asm
index ecd73d804..704586316 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp_overflow.asm
index 0f67d8c43..91b54ba09 100644
--- a/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_128bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0", "0"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp.asm b/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp.asm
index 0834b4807..58c0dc710 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp_overflow.asm
index 1a43bc2e7..735f3e8e2 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_1xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp.asm b/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp.asm
index 56dee4e9b..6e511699f 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp_overflow.asm
index b4ead228e..f1a4fabc6 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_2xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp.asm b/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp.asm
index 587bdc185..06581437d 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp_overflow.asm
index 347706101..4ab0a7cad 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_4xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp.asm b/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp.asm
index 07a8d281b..c14120ee3 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp.asm
@@ -16,7 +16,7 @@
     "XMM14": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"],
     "XMM15": ["0xf1cda2562209301d", "0x0f350767409162b7", "0x002fd22652633359", "0xc0a14faff7b7368a"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif
 
diff --git a/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp_overflow.asm b/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp_overflow.asm
index 023d9fdd0..67f8418e0 100644
--- a/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp_overflow.asm
+++ b/unittests/ASM/VEX/vpgather_qq_256bit_8xdisp_overflow.asm
@@ -4,7 +4,7 @@
     "XMM1":  ["0", "0", "0", "0"],
     "XMM15": ["0x2db6b85f6135a9d7", "0xe273f1177f80d2ec", "0x7be65e82db698176", "0x3fd4ea2f8a34fff5"]
   },
-  "HostFeatures": ["AVX2"]
+  "HostFeatures": ["AVX"]
 }
 %endif