diff --git a/mvapich3.changes b/mvapich3.changes
index a5040c5..25dadbc 100644
--- a/mvapich3.changes
+++ b/mvapich3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov  8 23:34:58 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Speed up testsuite by not rebuilding mvpich3 completely
+- Fix CFLAGS/FFLAGS
+
 -------------------------------------------------------------------
 Fri Jul 11 08:16:51 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 
diff --git a/mvapich3.spec b/mvapich3.spec
index 6edbfd1..b24e2f0 100644
--- a/mvapich3.spec
+++ b/mvapich3.spec
@@ -123,6 +123,10 @@ ExcludeArch:    %ix86 %arm
 %endif
 Requires:       mpi-selector
 
+%if 0%{?testsuite}
+BuildRequires:  %package_name-devel = %{version}
+%endif
+
 %description
 This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It
 is based on MPICH3 and MVICH.
@@ -174,8 +178,8 @@ cp /usr/share/automake*/config.* .
 
 # GCC10 needs an extra flag to allow badly passed parameters
 %if 0%{?suse_version} > 1500
-export FFLAGS="-fallow-argument-mismatch $FFLAGS"
-export CFLAGS="-std=gnu17 $CFLAGS"
+export FFLAGS="-fallow-argument-mismatch %{optflags}"
+export CFLAGS="-std=gnu17 %{optflags}"
 %endif
 
 ./autogen.sh --without-ucx --without-ofi --without-json
@@ -206,21 +210,25 @@ export CFLAGS="-std=gnu17 $CFLAGS"
    --with-device=ch4:ucx \
 %endif
   --without-mpe
-make %{?_smp_mflags} V=1
 
 %if 0%{?testsuite}
-%check
-make V=1 check
-%endif
-
 %install
-
-%if 0%{?testsuite}
-# Remove everything from testsuite package
-# It is all contained by mvapich3 packages
 rm -rf %{buildroot}/*
 
+%check
+# Disable CMA. Modern kernels require specific ptrace capabilities
+# that are not available in OBS
+export MPIR_CVAR_CH4_CMA_ENABLE=0
+for dir in src/mpl src/pm/hydra/mpl; do
+  (
+      cd $dir &&  make check
+  )
+done
+
 %else
+make %{?_smp_mflags} V=1
+
+%install
 make DESTDIR=%{buildroot} V=1 install
 
 rm -f %{buildroot}%{p_libdir}/libfmpich.la \