diff --git a/CMakeLists.txt b/CMakeLists.txt
index d061a1f..2b523a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,10 +88,10 @@ if (CXXBLAS_DEBUG)
 endif()
 
 OPTION(BUILD_TESTS "xtensor-blas test suite" OFF)
-OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
+OPTION(BUILD_BENCHMARK "xtensor-blas test suite" OFF)
 
-OPTION(BUILD_BENCHMARKS "xtensor-blas test suite" OFF)
-OPTION(DOWNLOAD_GBENCHMARK "build gtest from downloaded sources" OFF)
+OPTION(DOWNLOAD_GTEST "download gtest and build from source" OFF)
+OPTION(DOWNLOAD_GBENCHMARK "download google benchmark and build from source" OFF)
 
 if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
     set(BUILD_TESTS ON)
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
index 55cd476..5fbfc21 100644
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@@ -12,7 +12,7 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xtensor-benchmark)
 
     find_package(xtensor REQUIRED CONFIG)
-    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIR})
+    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS})
 endif ()
 
 message(STATUS "Forcing tests build type to Release")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 78dae34..bb99cc6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,13 +13,17 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xtensor-blas-test)
 
     find_package(xtensor REQUIRED CONFIG)
-    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIR})
+    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS})
     find_package(xtensor-blas REQUIRED CONFIG)
     set(XTENSOR_BLAS_INCLUDE_DIR ${xblas_INCLUDE_DIRS})
 endif ()
 
-message(STATUS "Forcing tests build type to Release")
-set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "Setting tests build type to Release")
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+else()
+    message(STATUS "Tests build type is ${CMAKE_BUILD_TYPE}")
+endif()
 
 include(CheckCXXCompilerFlag)
 
@@ -110,7 +114,6 @@ include_directories(${GTEST_INCLUDE_DIRS} SYSTEM)
 include_directories(${XTENSOR_INCLUDE_DIR})
 include_directories(${XBLAS_INCLUDE_DIR})
 
-find_package(xtensor REQUIRED)
 if(USE_OPENBLAS)
     find_package(OpenBLAS REQUIRED)
     set(BLAS_LIBRARIES ${CMAKE_INSTALL_PREFIX}${OpenBLAS_LIBRARIES})