diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbc8a714287c926fd76b26c7ab2484f74c75a0b3..73a1846204e9ec4ac22dd52b1269ddc0c041d152 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -D_REENTRANT")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -D_REENTRANT")
 
 #find dependencies
-FIND_PACKAGE(Eigen3 3.3 REQUIRED)
+FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG)
 FIND_PACKAGE(falkolib QUIET)
 find_package(PkgConfig)
 pkg_check_modules(csm QUIET csm )
@@ -97,7 +97,7 @@ IF(BUILD_TESTS)
   	add_subdirectory(test)
 ENDIF(BUILD_TESTS)
 
-FIND_PACKAGE(Doxygen)
+FIND_PACKAGE(Doxygen MODULE)
 
 FIND_PATH(IRI_DOC_DIR doxygen.conf ${CMAKE_SOURCE_DIR}/doc/iri_doc/)
 IF (IRI_DOC_DIR)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bd9211fad7399d593b2651c025d30e22e7ee8f1b..7358d24f757af241d6da1dd9d7c92197040c8257 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,6 +4,7 @@ add_subdirectory(gtest)
 #Include directories
 INCLUDE_DIRECTORIES(../src)
 INCLUDE_DIRECTORIES(/data)
+FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG)
 FIND_PACKAGE(PythonLibs QUIET)
 INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${csm_INCLUDE_DIRS})