diff --git a/CMakeLists.txt b/CMakeLists.txt
index c551c3b6b6818d53bf122af4a84c9ce597aff056..4bec83097449ade399f46e361ab88234c3e363a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,8 @@ ADD_SUBDIRECTORY( MeshLib )
 ADD_SUBDIRECTORY( OGS )
 ADD_SUBDIRECTORY( SimpleTests/MatrixTests )
 ADD_SUBDIRECTORY( SimpleTests/MeshTests )
-IF(NOT MSVC)
-        ADD_SUBDIRECTORY( SimpleTests/SolverTests )
-ENDIF(NOT MSVC)
+IF(NOT MSVC AND BLAS_FOUND AND LAPACK_FOUND)
+	ADD_SUBDIRECTORY( SimpleTests/SolverTests )
+ENDIF()
 
 CONFIGURE_FILE (BaseLib/BuildInfo.h.in ${PROJECT_BINARY_DIR}/BaseLib/BuildInfo.h)
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 14975e497f5eab1a1718a0f20bb794c947538d37..896517076a340b7cea4241182934bf34267a4cbe 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -1,12 +1,10 @@
 ## pthread ##
-SET ( CMAKE_THREAD_PREFER_PTHREAD On )
 IF (WIN32)
 	SET ( ADDITIONAL_LIBS Winmm.lib )
 ENDIF()
-FIND_PACKAGE( Threads )
+
 IF ( CMAKE_USE_PTHREADS_INIT )
         SET (HAVE_PTHREADS TRUE)
-        MESSAGE (STATUS "pthread library found." )
 ENDIF (CMAKE_USE_PTHREADS_INIT )
 
 INCLUDE_DIRECTORIES(
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index 33ead38b71b863e6ecb7a2eadafb7c860fc543ba..adb599b784364172c43690603203e35c1fd1f61e 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/SimpleTests/SolverTests/CMakeLists.txt
@@ -1,17 +1,3 @@
-## pthread ##
-SET ( CMAKE_THREAD_PREFER_PTHREAD On )
-FIND_PACKAGE( Threads )
-
-# Find blas
-FIND_PACKAGE ( BLAS REQUIRED )
-# Find lapack
-FIND_PACKAGE ( LAPACK REQUIRED )
-
-IF ( CMAKE_USE_PTHREADS_INIT )
-        SET (HAVE_PTHREADS TRUE)
-        MESSAGE (STATUS "pthread library found." )
-ENDIF (CMAKE_USE_PTHREADS_INIT )
-
 INCLUDE_DIRECTORIES(
         .
 	../../BaseLib/
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 9140083dd8e925f4d707ac7a151dacd6ee3426fe..35cc674da52494a8bd51c6c036f873e8fd17f0cc 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -45,3 +45,16 @@ IF ( QT4_FOUND )
 	INCLUDE( ${QT_USE_FILE} )
 	ADD_DEFINITIONS(${QT_DEFINITIONS})
 ENDIF (QT4_FOUND )
+
+## pthread ##
+SET ( CMAKE_THREAD_PREFER_PTHREAD ON )
+FIND_PACKAGE ( Threads )
+IF ( CMAKE_USE_PTHREADS_INIT )
+	SET (HAVE_PTHREADS TRUE)
+ENDIF (CMAKE_USE_PTHREADS_INIT )
+
+# blas
+FIND_PACKAGE ( BLAS )
+
+# lapack
+FIND_PACKAGE ( LAPACK )
\ No newline at end of file