diff --git a/CHANGELOG.md b/CHANGELOG.md
index d35b4cd..1ba30cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## DLA-Future-Fortran X.Y.Z
+
+### Fixed
+
+* Spack installation with `+test` variant by setting `-DMPIEXEC_MAX_NUMPROCS=6` [PR #10]
+
 ## DLA-Future-Fortran 0.1.0
 
 First release of [DLA-Future-Fortran], a Fortran interface for [DLA-Future].
diff --git a/spack/packages/dla-future-fortran/package.py b/spack/packages/dla-future-fortran/package.py
index b76419d..04f8b6f 100644
--- a/spack/packages/dla-future-fortran/package.py
+++ b/spack/packages/dla-future-fortran/package.py
@@ -46,7 +46,11 @@ def cmake_args(self):
         args = []
 
         args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared"))
-        args.append(self.define_from_variant("DLAF_FORTRAN_BUILD_TESTING", "test"))
+
+        if self.spec.satisfies("+test"):
+            args.append(self.define("DLAF_FORTRAN_BUILD_TESTING", True))
+            # Tests run with 6 MPI ranks
+            args.append(self.define("MPIEXEC_MAX_NUMPROCS", 6))
 
         # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         # FIXME: Variables only available on the DLA-Future-Fortran repo