diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3152a35b3..29871d4c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,10 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
 include(${PDAL_CMAKE_DIR}/gcs.cmake) # Optional
 include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
 
+find_package(PkgConfig REQUIRED)
+PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
+set(PDAL_VENDOR_EIGEN_DIR "${EIGEN_INCLUDE_DIRS}")
+
 #------------------------------------------------------------------------------
 # generate the pdal_features.hpp header
 #------------------------------------------------------------------------------
@@ -153,7 +157,6 @@ endif()
 add_subdirectory(plugins)
 
 if (WITH_TESTS)
-    include (${PDAL_CMAKE_DIR}/gtest.cmake)
     add_subdirectory(test)
 endif()
 add_subdirectory(dimbuilder)
diff --git a/cmake/directories.cmake b/cmake/directories.cmake
index 97e799bdb..f079ec725 100644
--- a/cmake/directories.cmake
+++ b/cmake/directories.cmake
@@ -11,5 +11,4 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels)
 set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters)
 set(PDAL_IO_DIR ${ROOT_DIR}/io)
 set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor)
-set(PDAL_VENDOR_EIGEN_DIR "${PDAL_VENDOR_DIR}/eigen")