diff --git a/xsimd-8.1.0-test-CMakeLists.txt.patch b/xsimd-8.1.0-test-CMakeLists.txt.patch
new file mode 100644
index 0000000..9e19638
--- /dev/null
+++ b/xsimd-8.1.0-test-CMakeLists.txt.patch
@@ -0,0 +1,42 @@
+--- xsimd-8.1.0/test/CMakeLists.txt.orig	2022-05-18 09:04:42.486294779 -0400
++++ xsimd-8.1.0/test/CMakeLists.txt	2022-05-18 09:16:15.862476846 -0400
+@@ -157,39 +157,9 @@
+ 
+ set(XSIMD_TESTS
+     main.cpp
+-    test_algorithms.cpp
+-    test_api.cpp
+     test_arch.cpp
+-    test_basic_math.cpp
+-    test_batch.cpp
+-    test_batch_bool.cpp
+-    test_batch_cast.cpp
+-    test_batch_complex.cpp
+-    test_batch_float.cpp
+-    test_batch_int.cpp
+-    test_bitwise_cast.cpp
+-    test_batch_constant.cpp
+-    test_batch_manip.cpp
+-    test_complex_exponential.cpp
+-    test_complex_hyperbolic.cpp
+-    test_complex_power.cpp
+-    test_complex_trigonometric.cpp
+-    test_conversion.cpp
+-    test_error_gamma.cpp
+-    test_exponential.cpp
+-    test_extract_pair.cpp
+-    test_fp_manipulation.cpp
+-    test_hyperbolic.cpp
+-    test_load_store.cpp
+     test_memory.cpp
+-    test_poly_evaluation.cpp
+-    test_power.cpp
+-    test_rounding.cpp
+-    test_select.cpp
+-    test_shuffle.cpp
+     test_sum.cpp
+-    test_traits.cpp
+-    test_trigonometric.cpp
+     test_utils.hpp
+ )
+ 
diff --git a/xsimd.spec b/xsimd.spec
index e68378c..de3748f 100644
--- a/xsimd.spec
+++ b/xsimd.spec
@@ -6,13 +6,19 @@ License:        BSD
 URL:            https://xsimd.readthedocs.io/
 %global github  https://github.com/xtensor-stack/xsimd
 Source0:        %{github}/archive/%{version}/%{name}-%{version}.tar.gz
-
+Patch0001:      xsimd-8.1.0-test-CMakeLists.txt.patch
 # Do not run tests on unsupported architectures
-Patch:          %{github}/pull/742.patch
+Patch0002:      %{github}/pull/742.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
+
+%ifarch %{arm}
+# Only used for testing, as it's a header-only package.
+%global optflags %(echo %{optflags} -mfpu=neon)
+%endif
 
 %ifarch %{arm}
 # Only used for testing, as it's a header-only package.