diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 46851798d7a73687719f4f1e7275042ae087c463..a546c691882731607a6edf27f685c3f214f61fb9 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -12,13 +12,6 @@ if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
    set( TEST_CATEGORIES ${TEST_CATEGORIES} shmgpu )
 endif()
 
-# if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
-#    set( TEST_CATEGORIES ${TEST_CATEGORIES} mpi )
-#    if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
-#       set( TEST_CATEGORIES ${TEST_CATEGORIES} mpigpu )
-#    endif()
-# endif()
-
 foreach(cat  ${TEST_CATEGORIES})
   foreach(prec ${RP_CHAMELEON_PRECISIONS})
 
@@ -47,7 +40,13 @@ foreach(cat  ${TEST_CATEGORIES})
   endforeach()
 endforeach()
 
-#foreach(prec ${RP_CHAMELEON_PRECISIONS})
-#    add_test(test_mpi_${prec}lange mpirun -np 4 ./${prec}testing 1 0 LANGE 600 500 600 --p=2)
-#endforeach()
+#if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
+#    set( TEST_CATEGORIES ${TEST_CATEGORIES} mpi )
+#    if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
+#        set( TEST_CATEGORIES ${TEST_CATEGORIES} mpigpu )
+#    endif()
+#    foreach(prec ${RP_CHAMELEON_PRECISIONS})
+#        add_test(test_mpi_${prec}lange mpirun -np 4 ./${prec}testing 1 0 LANGE 600 500 600 --p=2)
+#    endforeach()
+#endif()
 
diff --git a/timing/CTestLists.cmake b/timing/CTestLists.cmake
index 19982b584fadca8dd00197927bf0af03fddecee6..06e9f0f0d15dabd1f88b47c675f62acca695eaa5 100644
--- a/timing/CTestLists.cmake
+++ b/timing/CTestLists.cmake
@@ -17,13 +17,6 @@ if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
    set( TEST_CATEGORIES ${TEST_CATEGORIES} shmgpu )
 endif()
 
-# if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
-#    set( TEST_CATEGORIES ${TEST_CATEGORIES} mpi )
-#    if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
-#       set( TEST_CATEGORIES ${TEST_CATEGORIES} mpigpu )
-#    endif()
-# endif()
-
 set(TESTLIST 
     gels
     gemm
@@ -53,3 +46,23 @@ foreach(cat ${TEST_CATEGORIES})
     endforeach()
 endforeach()
 
+if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
+    set( TEST_CATEGORIES mpi )
+    set( TEST_CMD_mpi    "--p=2 --n_range=20000:20000:1 --nb=320")
+    set( TEST_CMD_mpigpu "--p=2 --gpus=3")
+    #set( TEST_CATEGORIES ${TEST_CATEGORIES} mpi )
+    #if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
+    #    set( TEST_CATEGORIES ${TEST_CATEGORIES} mpigpu )
+    #endif()
+    set(TESTLIST_MPI
+        potrf
+        )
+    foreach(cat ${TEST_CATEGORIES})
+        foreach(prec ${RP_CHAMELEON_PRECISIONS})
+            foreach(test ${TESTLIST_MPI})
+                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+            endforeach()
+        endforeach()
+    endforeach()
+endif()
+