diff --git a/hwy/contrib/matvec/matvec_test.cc b/hwy/contrib/matvec/matvec_test.cc
index 80df07bea2..b5f2facce9 100644
--- a/hwy/contrib/matvec/matvec_test.cc
+++ b/hwy/contrib/matvec/matvec_test.cc
@@ -17,8 +17,7 @@
 
 // Reduce targets to avoid timeout under emulation.
 #ifndef HWY_DISABLED_TARGETS
-#define HWY_DISABLED_TARGETS \
-  (HWY_SVE2_128 | HWY_SVE2 | HWY_SVE_256 | HWY_NEON_WITHOUT_AES)
+#define HWY_DISABLED_TARGETS (HWY_SVE2_128 | HWY_SVE2 | HWY_SVE_256 | HWY_NEON)
 #endif
 
 #include <stddef.h>
diff --git a/hwy/tests/fma_test.cc b/hwy/tests/fma_test.cc
index e49573dcf7..051b15797e 100644
--- a/hwy/tests/fma_test.cc
+++ b/hwy/tests/fma_test.cc
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// For faster build on Arm. We still test SVE2_128, SVE and NEON.
+// For faster Arm builds. We still test SVE2_128, SVE and HWY_NEON_WITHOUT_AES
+// (HWY_NEON may already be disabled, which would leave only EMU128).
 #ifndef HWY_DISABLED_TARGETS
-#define HWY_DISABLED_TARGETS (HWY_SVE_256 | HWY_NEON_WITHOUT_AES | HWY_SVE2)
+#define HWY_DISABLED_TARGETS (HWY_SVE_256 | HWY_NEON | HWY_SVE2)
 #endif
 
 #undef HWY_TARGET_INCLUDE
diff --git a/hwy/tests/minmax_number_test.cc b/hwy/tests/minmax_number_test.cc
index 5e46822ec6..eb10e878d3 100644
--- a/hwy/tests/minmax_number_test.cc
+++ b/hwy/tests/minmax_number_test.cc
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// For faster build on Arm. We still test SVE, SVE2, and NEON.
+// For faster Arm builds. We still test SVE2_128, SVE and HWY_NEON_WITHOUT_AES
+// (HWY_NEON may already be disabled, which would leave only EMU128).
 #ifndef HWY_DISABLED_TARGETS
-#define HWY_DISABLED_TARGETS (HWY_NEON_WITHOUT_AES | HWY_SVE_256 | HWY_SVE2_128)
+#define HWY_DISABLED_TARGETS (HWY_SVE_256 | HWY_NEON | HWY_SVE2)
 #endif
 
 #undef HWY_TARGET_INCLUDE
diff --git a/hwy/tests/minmax_test.cc b/hwy/tests/minmax_test.cc
index 36d288b6b1..db7398de41 100644
--- a/hwy/tests/minmax_test.cc
+++ b/hwy/tests/minmax_test.cc
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// For faster build on Arm. We still test SVE, SVE2, and NEON.
+// For faster Arm builds. We still test SVE2_128, SVE and HWY_NEON_WITHOUT_AES
+// (HWY_NEON may already be disabled, which would leave only EMU128).
 #ifndef HWY_DISABLED_TARGETS
-#define HWY_DISABLED_TARGETS (HWY_NEON_WITHOUT_AES | HWY_SVE_256 | HWY_SVE2_128)
+#define HWY_DISABLED_TARGETS (HWY_SVE_256 | HWY_NEON | HWY_SVE2)
 #endif
 
 #undef HWY_TARGET_INCLUDE