--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -392,7 +392,6 @@ if [gas_32_check] then {
     run_dump_test "avx512f_vl-intel"
     run_dump_test "avx512f_vl-opts-intel"
     run_dump_test "avx512f_vl-opts"
-    run_dump_test "avx512f_vl-wig1-intel"
     run_dump_test "avx512f_vl-wig1"
     run_dump_test "avx512f_vl"
     run_dump_test "avx512cd_vl-intel"
@@ -400,13 +399,11 @@ if [gas_32_check] then {
     run_dump_test "avx512bw-intel"
     run_dump_test "avx512bw-opts-intel"
     run_dump_test "avx512bw-opts"
-    run_dump_test "avx512bw-wig1-intel"
     run_dump_test "avx512bw-wig1"
     run_dump_test "avx512bw"
     run_dump_test "avx512bw_vl-intel"
     run_dump_test "avx512bw_vl-opts-intel"
     run_dump_test "avx512bw_vl-opts"
-    run_dump_test "avx512bw_vl-wig1-intel"
     run_dump_test "avx512bw_vl-wig1"
     run_dump_test "avx512bw_vl"
     run_dump_test "avx512dq-intel"
@@ -418,21 +415,13 @@ if [gas_32_check] then {
     run_dump_test "omit-lock-no"
     run_dump_test "fence-as-lock-add-yes"
     run_dump_test "fence-as-lock-add-no"
-    run_dump_test "avx512dq-rcigrd-intel"
     run_dump_test "avx512dq-rcigrd"
-    run_dump_test "avx512dq-rcigrne-intel"
     run_dump_test "avx512dq-rcigrne"
-    run_dump_test "avx512dq-rcigru-intel"
     run_dump_test "avx512dq-rcigru"
-    run_dump_test "avx512dq-rcigrz-intel"
     run_dump_test "avx512dq-rcigrz"
-    run_dump_test "avx512er-rcigrd-intel"
     run_dump_test "avx512er-rcigrd"
-    run_dump_test "avx512er-rcigrne-intel"
     run_dump_test "avx512er-rcigrne"
-    run_dump_test "avx512er-rcigru-intel"
     run_dump_test "avx512er-rcigru"
-    run_dump_test "avx512er-rcigrz-intel"
     run_dump_test "avx512er-rcigrz"
     run_dump_test "avx512f-rcigrd-intel"
     run_dump_test "avx512f-rcigrd"
--- a/gas/testsuite/gas/i386/x86-64.exp
+++ b/gas/testsuite/gas/i386/x86-64.exp
@@ -322,7 +322,6 @@ run_list_test "x86-64-equ-bad"
 run_dump_test "x86-64-avx512f_vl-intel"
 run_dump_test "x86-64-avx512f_vl-opts-intel"
 run_dump_test "x86-64-avx512f_vl-opts"
-run_dump_test "x86-64-avx512f_vl-wig1-intel"
 run_dump_test "x86-64-avx512f_vl-wig1"
 run_dump_test "x86-64-avx512f_vl"
 run_dump_test "x86-64-avx512cd_vl-intel"
@@ -330,13 +329,11 @@ run_dump_test "x86-64-avx512cd_vl"
 run_dump_test "x86-64-avx512bw-intel"
 run_dump_test "x86-64-avx512bw-opts-intel"
 run_dump_test "x86-64-avx512bw-opts"
-run_dump_test "x86-64-avx512bw-wig1-intel"
 run_dump_test "x86-64-avx512bw-wig1"
 run_dump_test "x86-64-avx512bw"
 run_dump_test "x86-64-avx512bw_vl-intel"
 run_dump_test "x86-64-avx512bw_vl-opts-intel"
 run_dump_test "x86-64-avx512bw_vl-opts"
-run_dump_test "x86-64-avx512bw_vl-wig1-intel"
 run_dump_test "x86-64-avx512bw_vl-wig1"
 run_dump_test "x86-64-avx512bw_vl"
 run_dump_test "x86-64-avx512dq-intel"
@@ -347,10 +344,6 @@ run_dump_test "x86-64-suffix"
 run_dump_test "x86-64-suffix-intel"
 run_dump_test "x86-64-default-suffix"
 run_dump_test "x86-64-default-suffix-avx"
-run_dump_test "x86-64-avx512dq-rcigrd-intel"
-run_dump_test "x86-64-avx512dq-rcigrd"
-run_dump_test "x86-64-avx512dq-rcigrne-intel"
-run_dump_test "x86-64-avx512dq-rcigrne"
 run_dump_test "x86-64-apx-push2pop2"
 run_dump_test "x86-64-apx-push2pop2-intel"
 run_list_test "x86-64-apx-push2pop2-inval"
@@ -362,17 +355,13 @@ run_dump_test "x86-64-apx-cfcmov-intel"
 run_dump_test "x86-64-apx-pushp-popp"
 run_dump_test "x86-64-apx-pushp-popp-intel"
 run_list_test "x86-64-apx-pushp-popp-inval"
-run_dump_test "x86-64-avx512dq-rcigru-intel"
+run_dump_test "x86-64-avx512dq-rcigrd"
+run_dump_test "x86-64-avx512dq-rcigrne"
 run_dump_test "x86-64-avx512dq-rcigru"
-run_dump_test "x86-64-avx512dq-rcigrz-intel"
 run_dump_test "x86-64-avx512dq-rcigrz"
-run_dump_test "x86-64-avx512er-rcigrd-intel"
 run_dump_test "x86-64-avx512er-rcigrd"
-run_dump_test "x86-64-avx512er-rcigrne-intel"
 run_dump_test "x86-64-avx512er-rcigrne"
-run_dump_test "x86-64-avx512er-rcigru-intel"
 run_dump_test "x86-64-avx512er-rcigru"
-run_dump_test "x86-64-avx512er-rcigrz-intel"
 run_dump_test "x86-64-avx512er-rcigrz"
 run_dump_test "x86-64-avx512f-rcigrd-intel"
 run_dump_test "x86-64-avx512f-rcigrd"
@@ -380,6 +369,8 @@ run_dump_test "x86-64-avx512f-rcigrne-in
 run_dump_test "x86-64-avx512f-rcigrne"
 run_dump_test "x86-64-avx512f-rcigru-intel"
 run_dump_test "x86-64-avx512f-rcigru"
+run_dump_test "x86-64-avx512f-rcigrz-intel"
+run_dump_test "x86-64-avx512f-rcigrz"
 run_list_test "x86-64-apx-inval"
 run_list_test "x86-64-apx-egpr-inval"
 run_dump_test "x86-64-apx-evex-promoted-bad"
@@ -405,8 +396,6 @@ run_list_test "x86-64-apx-zu-inval"
 run_dump_test "x86-64-apx_f-evex"
 run_dump_test "sse2avx-apx"
 run_dump_test "sse2avx-evex"
-run_dump_test "x86-64-avx512f-rcigrz-intel"
-run_dump_test "x86-64-avx512f-rcigrz"
 run_dump_test "x86-64-clwb"
 run_dump_test "x86-64-clwb-intel"
 run_dump_test "x86-64-avx512ifma"