diff --git a/.travis.yml b/.travis.yml
index 1fa045d81ff1f052c593e529509637a27c4022ca..083c63d62b9cc3276cc6be6f4a2d16c355a80918 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ script:
   - cd build
   - cmake $CMAKE_ARGS ..
   - make
-  - if [[ "$CASE" != "CLI_PETSC" ]]; then make tests; fi
+  - make tests
   # PetSc
   - if [[ "$CASE" == "CLI_PETSC" ]]; then make tests_mpi; fi
 
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 65de70dd2b034ef07f3e275de829fcbd3f21c5b5..c1f3e9d361b8f6c469825abffa03e9fee0be7108 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -23,7 +23,9 @@ if(OGS_USE_PETSC)
     target_link_libraries(ogs ${PETSC_LIBRARIES})
 endif()
 
-include(Tests.cmake)
+if(NOT OGS_USE_MPI)
+    include(Tests.cmake)
+endif()
 
 ####################
 ### Installation ###
diff --git a/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp b/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
index c22c9a0db68d49fa4c8b02d03642f20ec822efc5..396241f0b92b5da3bb98bc90b24229e16fac1d48 100644
--- a/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
+++ b/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
@@ -97,6 +97,11 @@ REGISTER_TYPED_TEST_CASE_P(AssemblerLibSerialVectorMatrixBuilder,
 #include "MathLib/LinAlg/Lis/LisMatrix.h"
 #endif  // USE_LIS
 
+#ifdef USE_PETSC
+#include "MathLib/LinAlg/PETSc/PETScVector.h"
+#include "MathLib/LinAlg/PETSc/PETScMatrix.h"
+#endif  // USE_PETSC
+
 typedef ::testing::Types
     < AssemblerLib::SerialVectorMatrixBuilder<
         MathLib::GlobalDenseMatrix<double>, MathLib::DenseVector<double>>
@@ -104,6 +109,10 @@ typedef ::testing::Types
     , AssemblerLib::SerialVectorMatrixBuilder<
         MathLib::LisMatrix, MathLib::LisVector>
 #endif  // USE_LIS
+#ifdef USE_PETSC
+    , AssemblerLib::SerialVectorMatrixBuilder<
+        MathLib::PETScMatrix, MathLib::PETScVector>
+#endif  // USE_PETSC
     > TestTypes;
 
 INSTANTIATE_TYPED_TEST_CASE_P(templated, AssemblerLibSerialVectorMatrixBuilder,
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 175e4608ae5c49c4f7b97ff99ef791065a1ff5b0..eb43f25ea8c5854b711190c080e92505f50f54f5 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -20,6 +20,10 @@ if(QT4_FOUND)
 	set(TEST_SOURCES ${TEST_SOURCES} FileIO/TestXmlGmlReader.cpp)
 endif()
 
+if(OGS_USE_PETSC OR OGS_USE_MPI)
+	list(REMOVE_ITEM TEST_SOURCES AssemblerLib/TestSerialLinearSolver.cpp)
+endif()
+
 include_directories(
 	${CMAKE_SOURCE_DIR}/AssemblerLib
 	${CMAKE_SOURCE_DIR}/BaseLib
@@ -90,7 +94,7 @@ if(DEFINED ENV{CI})
 endif()
 if(OGS_USE_PETSC)
 	add_custom_target(tests
-		mpirun -np 1 $<TARGET_FILE:testrunner> ${TESTRUNNER_ADDITIONAL_ARGUMENTS} --gtest_filter=-MPITest*:*AssemblerLib*
+		mpirun -np 1 $<TARGET_FILE:testrunner> ${TESTRUNNER_ADDITIONAL_ARGUMENTS} --gtest_filter=-MPITest*
 		DEPENDS testrunner
 	)
 	add_custom_target(tests_mpi