diff --git a/tests/mpi/mpi_test_suite.sh b/tests/mpi/mpi_test_suite.sh
index cffaab9..32317fc 100755
--- a/tests/mpi/mpi_test_suite.sh
+++ b/tests/mpi/mpi_test_suite.sh
@@ -1,12 +1,22 @@
 #!/bin/bash
+# Chrsitoph Niethammer <niethammer@hlrs.de> (C) 2012
+
 set -e
 
 ROOT=$HOME/mpi_test_suite
+for mpi in $(module av mpi -l 2>&1 | awk '/^mpi/{print $1;}'); do 
 
-cd $ROOT
-./autogen.sh
-CC=mpicc ./configure 
-#--enable-mpi2 --enable-mpi2-io --enable-mpi-onesided
-make -j $(grep -c processor /proc/cpuinfo)
-
-mpirun mpi_test_suite -x relaxed -d All,^MPI_TYPE_MIX,^MPI_SHORT_INT -t All,^One-sided
+  echo $mpi
+  logfile="$(basename $(dirname $mpi))-$(basename $mpi)-$(date +%Y-%M-%dT%H:%m).log"
+  {
+    module load $mpi
+    cd $ROOT
+    ./autogen.sh
+    ./configure CC=mpicc CXX=mpicxx
+    #--enable-mpi2 --enable-mpi2-io --enable-mpi-onesided
+    make clean
+    make -j $(grep -c processor /proc/cpuinfo)
+    mpirun $ROOT/mpi_test_suite -x relaxed -d All,^MPI_TYPE_MIX,^MPI_SHORT_INT -t "All,^One-sided,^IO" 
+  } 2>&1 | tee ~/$logfile
+  module rm mpi
+done