diff --git a/.travis.yml b/.travis.yml
index c54b27a0e255b5fbfbce4c0adf52f32ebe9e0685..c5954bdc02280e62ed13b5f757ddff7d4e45fa7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,9 @@ before_install:
 
 script:
   - "pwd & mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake .. && make"
-  - make test
+  - make tests
   # PetSc
-  - if [[ "$CASE" == "CLI_PETSC" ]]; then make test_mpi; fi
+  - if [[ "$CASE" == "CLI_PETSC" ]]; then make tests_mpi; fi
 
 notifications:
   email:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e129fb2d19b6a061c454b48df4d5de58163fcd02..94621bfc4aebb8ec59a57e29763a699f988c033d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,9 @@ ENDIF() # OGS_BUILD_GUI
 ADD_SUBDIRECTORY( AssemblerLib )
 ADD_SUBDIRECTORY( BaseLib )
 # TODO This is a hack but we have to make sure that Boost is built first
-ADD_DEPENDENCIES(BaseLib Boost)
+IF(TARGET Boost)
+	ADD_DEPENDENCIES(BaseLib Boost)
+ENDIF()
 ADD_SUBDIRECTORY( FileIO )
 ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index aecf84bf46794f020688d32211b62ee0959f5b8a..e629f1b421ef767bf6477119696cee3e37bf2501 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -97,7 +97,7 @@ IF (GEOTIFF_FOUND)
 	TARGET_LINK_LIBRARIES( ogs-gui ${GEOTIFF_LIBRARIES} )
 ENDIF () # GEOTIFF_FOUND
 
-ADD_DEPENDENCIES ( ogs-gui VtkVis OGSProject )
+ADD_DEPENDENCIES ( ogs-gui VtkVis )
 
 IF(MSVC)
 	# Set linker flags
diff --git a/Gui/DataView/CMakeLists.txt b/Gui/DataView/CMakeLists.txt
index 21a66b87756a4b3c9e3f9d0845b7a0ebbfc52dc6..9e88241253a734c28c84319ce8d264b7c9099303 100644
--- a/Gui/DataView/CMakeLists.txt
+++ b/Gui/DataView/CMakeLists.txt
@@ -198,7 +198,9 @@ target_link_libraries( QtDataView
 	shp
 )
 
-ADD_DEPENDENCIES(QtDataView VtkRescan)
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(QtDataView VtkRescan)
+ENDIF()
 
 IF (GEOTIFF_FOUND)
 	TARGET_LINK_LIBRARIES( QtDataView ${GEOTIFF_LIBRARIES} )
diff --git a/Gui/VtkAct/CMakeLists.txt b/Gui/VtkAct/CMakeLists.txt
index d5f79ed551f31caacb8e393e85becce3dbeee4e4..db6a28d37d2ee3c34ca49ffc90cc222c33fd4043 100644
--- a/Gui/VtkAct/CMakeLists.txt
+++ b/Gui/VtkAct/CMakeLists.txt
@@ -49,7 +49,10 @@ add_library( VtkAct STATIC
 	${MOC_SOURCES}
 	${UIS}
 )
-ADD_DEPENDENCIES(VtkAct VtkRescan)
+
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(VtkAct VtkRescan)
+ENDIF()
 
 target_link_libraries( VtkAct ${QT_LIBRARIES} )
 
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 7c6f6af41c2688fb3f35a938f001d1d3499b9c38..eaaa3aa07b16ee1677729ce8e18acba1537f5821 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -152,7 +152,9 @@ ADD_LIBRARY( VtkVis STATIC
 	${UIS}
 )
 
-ADD_DEPENDENCIES(VtkVis VtkRescan)
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(VtkVis VtkRescan)
+ENDIF()
 
 IF (GEOTIFF_FOUND)
 	INCLUDE_DIRECTORIES( ${GEOTIFF_INCLUDE_DIRS} )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3e5cc42b013d09be328a19dcdd635192f21011f3..0e3b5c0eae842f60e1db2db9abdb0484a64885e7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -38,7 +38,9 @@ ENDIF()
 
 ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES})
 SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing)
-ADD_DEPENDENCIES(testrunner Eigen)
+IF(TARGET Eigen)
+	ADD_DEPENDENCIES(testrunner Eigen)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(testrunner
 	GTest
@@ -68,25 +70,23 @@ IF(OGS_BUILD_GUI)
 ENDIF()
 
 IF (QT4_FOUND)
-  TARGET_LINK_LIBRARIES(testrunner
-  	${QT_LIBRARIES}
-  )
+	TARGET_LINK_LIBRARIES(testrunner ${QT_LIBRARIES})
 ENDIF()
 
 
 # Add make-target test which runs the testrunner
 # This should override CTest's predefined test-target but it does not
 IF (OGS_USE_PETSC)
-	ADD_CUSTOM_TARGET(test
+	ADD_CUSTOM_TARGET(tests
 		mpirun -np 1 $<TARGET_FILE:testrunner> --gtest_filter=-MPITest*
 		DEPENDS testrunner
 	)
-	ADD_CUSTOM_TARGET(test_mpi
+	ADD_CUSTOM_TARGET(tests_mpi
 		mpirun -np 3 $<TARGET_FILE:testrunner>  --gtest_filter=MPITest*
 		DEPENDS testrunner
 	)
 ELSE ()
-	ADD_CUSTOM_TARGET(test
+	ADD_CUSTOM_TARGET(tests
 		$<TARGET_FILE:testrunner>
 		DEPENDS testrunner
 	)