diff --git a/dune/istl/paamg/test/CMakeLists.txt b/dune/istl/paamg/test/CMakeLists.txt
index 01c56f8f1ba8167d1dfe3077ba02de8bf80719d4..2146a45c526d852132b7e82774e9f692273dab15 100644
--- a/dune/istl/paamg/test/CMakeLists.txt
+++ b/dune/istl/paamg/test/CMakeLists.txt
@@ -64,20 +64,26 @@ endif()
 
 dune_add_test(SOURCES twolevelmethodtest.cc)
 
-dune_add_test(SOURCES galerkintest.cc)
 dune_add_test(SOURCES graphtest.cc)
-dune_add_test(SOURCES hierarchytest.cc)
-dune_add_test(SOURCES kamgtest.cc)
-
-dune_add_test(NAME pamg_comm_repart_test
-              SOURCES parallelamgtest.cc
-              COMPILE_DEFINITIONS -DAMG_REPART_ON_COMM_GRAPH)
 
-dune_add_test(NAME pamgtest
-              SOURCES parallelamgtest.cc)
+dune_add_test(SOURCES kamgtest.cc)
 
 dune_add_test(SOURCES transfertest.cc)
 
 dune_add_test(NAME twolevelmethodschwarztest
               SOURCES twolevelmethodtest.cc
               COMPILE_DEFINITIONS USE_OVERLAPPINGSCHWARZ)
+
+# These tests need MPI, even though they are only run sequentially
+if(MPI_FOUND)
+  dune_add_test(SOURCES galerkintest.cc)
+
+  dune_add_test(SOURCES hierarchytest.cc)
+
+  dune_add_test(NAME pamgtest
+                SOURCES parallelamgtest.cc)
+
+  dune_add_test(NAME pamg_comm_repart_test
+                SOURCES parallelamgtest.cc
+                COMPILE_DEFINITIONS -DAMG_REPART_ON_COMM_GRAPH)
+endif()
\ No newline at end of file
diff --git a/dune/istl/test/CMakeLists.txt b/dune/istl/test/CMakeLists.txt
index 33f7d295b0b6e46082c9634ca8d4e62068bbd38a..43c23bc994200e622d7ed3ac33c610e05f342a75 100644
--- a/dune/istl/test/CMakeLists.txt
+++ b/dune/istl/test/CMakeLists.txt
@@ -89,9 +89,11 @@ dune_add_test(SOURCES overlappingschwarztest.cc
               SKIP_ON_77)
 
 # MPI tests
-dune_add_test(SOURCES matrixredisttest.cc)
+if(MPI_FOUND)
+  dune_add_test(SOURCES matrixredisttest.cc)
 
-dune_add_test(SOURCES vectorcommtest.cc)
+  dune_add_test(SOURCES vectorcommtest.cc)
+endif()
 
 dune_add_test(SOURCES matrixmarkettest.cc)