diff --git a/batched/CMakeLists.txt b/batched/CMakeLists.txt
index 3103dfa8a0..544bd713b3 100644
--- a/batched/CMakeLists.txt
+++ b/batched/CMakeLists.txt
@@ -4,11 +4,9 @@ LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/batched/eti)
 
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/dense/src)
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/dense/impl)
-LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/dense/unit_test)
 
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/sparse/src)
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/sparse/impl)
-LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/sparse/unit_test)
 
 IF (NOT KokkosKernels_ENABLE_COMPONENT_BLAS)
   LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/blas/impl)
diff --git a/batched/dense/unit_test/CMakeLists.txt b/batched/dense/unit_test/CMakeLists.txt
index f970e81e66..e9ad450691 100644
--- a/batched/dense/unit_test/CMakeLists.txt
+++ b/batched/dense/unit_test/CMakeLists.txt
@@ -18,6 +18,9 @@ KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_C
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/batched/dense/impl)
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/batched/dense/impl)
 
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
 IF (NOT KokkosKernels_ENABLE_COMPONENT_BLAS)
   KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/blas/src)
   KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_SOURCE_DIR}/blas/src)
diff --git a/batched/sparse/unit_test/CMakeLists.txt b/batched/sparse/unit_test/CMakeLists.txt
index 63c34906b3..7f0a6d7a4f 100644
--- a/batched/sparse/unit_test/CMakeLists.txt
+++ b/batched/sparse/unit_test/CMakeLists.txt
@@ -18,6 +18,9 @@ KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_C
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/batched/dense/impl)
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/batched/sparse/impl)
 
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
 IF (NOT KokkosKernels_ENABLE_COMPONENT_BLAS)
   MESSAGE("batched enabled and blas not enabled, we need to include some include directories manually!")
   KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/blas)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index b065869296..3961dbff9a 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,4 +1,3 @@
 # Adding source directory to the build
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/common/src)
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/common/impl)
-LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/common/unit_test)
diff --git a/common/unit_test/CMakeLists.txt b/common/unit_test/CMakeLists.txt
index c0d8fc116f..c727a74e80 100644
--- a/common/unit_test/CMakeLists.txt
+++ b/common/unit_test/CMakeLists.txt
@@ -7,6 +7,9 @@
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_common)
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_SOURCE_DIR}/test_common)
 
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
 #####################
 #                   #
 # Define unit-tests #
diff --git a/ode/CMakeLists.txt b/ode/CMakeLists.txt
index b9cf089445..409268e9b1 100644
--- a/ode/CMakeLists.txt
+++ b/ode/CMakeLists.txt
@@ -1,6 +1,5 @@
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ode/src)
 LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ode/impl)
-LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ode/unit_test)
 
 IF (NOT KokkosKernels_ENABLE_COMPONENT_BATCHED)
   MESSAGE("blas enabled and batched not enabled, we need to include some headers manually!")
diff --git a/ode/unit_test/CMakeLists.txt b/ode/unit_test/CMakeLists.txt
index 90d6c45c49..27d407896d 100644
--- a/ode/unit_test/CMakeLists.txt
+++ b/ode/unit_test/CMakeLists.txt
@@ -18,6 +18,9 @@ KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_C
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ode/impl)
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/ode/impl)
 
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
 #####################
 #                   #
 # Define unit-tests #