diff --git a/test/Default.xml b/test/Default.xml
index c0abbfe41a1e16aa8d3946e30dc4e540e384c767..5f18cf1f8376770848a9473f9546e3cc3472c4ff 100644
--- a/test/Default.xml
+++ b/test/Default.xml
@@ -29,7 +29,7 @@
     <parameter name="DefaultCompiler">GCC</parameter>
     <parameter name="Compiler" tag="!noCompileRunTest">GCC,Intel,NVHPC</parameter>
     <parameter name="Compiler" tag="noCompileRunTest">${DefaultCompiler}</parameter>
-    <parameter name="DefaultMPI">OpenMPI</parameter>
+    <parameter name="DefaultMPI">ParaStationMPI,OpenMPI</parameter>
     <parameter name="MPI" mode="python" tag="!noCompileRunTest">
         {
         "GCC":   "ParaStationMPI,OpenMPI",
diff --git a/test/ModeTest.xml b/test/ModeTest.xml
index 98f2f509b79ae4bf994803041f1d20e36fbfd436..cea91179d7bafa3d4b1a8e0f9503fa51734b6dec 100644
--- a/test/ModeTest.xml
+++ b/test/ModeTest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jube>
 <parameterset name="Linktest_Args" init_with="Default.xml"> 
-    <parameter name="i"                                                   type="int">0,1,2,3,4,5,6,7,8,9,10</parameter>
+    <parameter name="i"                                                   type="int">6</parameter>
     <parameter name="All_To_All"                            mode="python" type="int">[0,1,0,0,0,0,0,0,0,0,0][$i]</parameter>
     <parameter name="Bidirectional"                         mode="python" type="int">[0,0,1,0,0,0,0,0,0,0,0][$i]</parameter>
     <parameter name="Bisection"                             mode="python" type="int">[0,0,0,1,0,0,0,0,1,0,0][$i]</parameter>