diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index 82429c2e80..d359291048 100755
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -141,7 +141,6 @@ target_link_libraries(GraphSchedulerTest
                         IR
                         gtest
                         TestMain)
-target_include_directories(GraphSchedulerTest PRIVATE ${CMAKE_SOURCE_DIR}/lib/IR)
 add_glow_test(GraphSchedulerTest ${GLOW_BINARY_DIR}/tests/GraphSchedulerTest --gtest_output=xml:GraphSchedulerTest.xml)
 
 add_executable(QuantizationTest
@@ -283,12 +282,11 @@ target_link_libraries(LLVMIRGenTest
                         Support
                         gtest
                         TestMain)
-target_include_directories(LLVMIRGenTest PUBLIC ${CMAKE_SOURCE_DIR}/lib/Backends/CPU)
 add_glow_test(LLVMIRGenTest ${GLOW_BINARY_DIR}/tests/LLVMIRGenTest --gtest_output=xml:LLVMIRGenTest.xml)
 
-add_executable(cpuDeviceTest
+add_executable(CPUDeviceTest
                CPUDeviceManagerTest.cpp)
-target_link_libraries(cpuDeviceTest
+target_link_libraries(CPUDeviceTest
                       PRIVATE
                         Backends
                         DeviceManager
@@ -299,8 +297,7 @@ target_link_libraries(cpuDeviceTest
                         Optimizer
                         gtest
                         TestMain)
-target_include_directories(cpuDeviceTest PUBLIC ${CMAKE_SOURCE_DIR}/lib/Backends/CPU)
-add_glow_test(cpuDeviceTest ${GLOW_BINARY_DIR}/tests/cpuDeviceTest --gtest_output=xml:cpuDeviceTest.xml)
+add_glow_test(CPUDeviceTest ${GLOW_BINARY_DIR}/tests/CPUDeviceTest --gtest_output=xml:CPUDeviceTest.xml)
 
 endif()
 
@@ -347,9 +344,6 @@ target_link_libraries(GlowOnnxifiManagerTest
                         onnxifi-glow-lib
                         gtest
                         TestMain)
-target_include_directories(GlowOnnxifiManagerTest
-                           PRIVATE
-                           ${CMAKE_SOURCE_DIR}/lib/Onnxifi ${GLOW_THIRDPARTY_DIR}/onnx)
 add_glow_test(NAME GlowOnnxifiManagerTest
               COMMAND ${GLOW_BINARY_DIR}/tests/GlowOnnxifiManagerTest --gtest_output=xml:GlowOnnxifiManagerTest.xml
               WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/tests/unittests/CPUDeviceManagerTest.cpp b/tests/unittests/CPUDeviceManagerTest.cpp
index 3e264778ad..9ef8a9d94f 100644
--- a/tests/unittests/CPUDeviceManagerTest.cpp
+++ b/tests/unittests/CPUDeviceManagerTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "CPUDeviceManager.h"
+#include "../../lib/Backends/CPU/CPUDeviceManager.h"
 #include "glow/ExecutionEngine/ExecutionEngine.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/unittests/GlowOnnxifiManagerTest.cpp b/tests/unittests/GlowOnnxifiManagerTest.cpp
index df53625563..7bba2714d8 100644
--- a/tests/unittests/GlowOnnxifiManagerTest.cpp
+++ b/tests/unittests/GlowOnnxifiManagerTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "GlowOnnxifiManager.h"
+#include "../../lib/Onnxifi/GlowOnnxifiManager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/tests/unittests/GraphSchedulerTest.cpp b/tests/unittests/GraphSchedulerTest.cpp
index e65c94bf83..f2fb2f1bfc 100644
--- a/tests/unittests/GraphSchedulerTest.cpp
+++ b/tests/unittests/GraphSchedulerTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "GraphScheduler.h"
+#include "../../lib/IR/GraphScheduler.h"
 
 #include "glow/Graph/Context.h"
 #include "glow/Graph/Graph.h"
diff --git a/tests/unittests/LLVMIRGenTest.cpp b/tests/unittests/LLVMIRGenTest.cpp
index f50b218dc5..51c21361d7 100644
--- a/tests/unittests/LLVMIRGenTest.cpp
+++ b/tests/unittests/LLVMIRGenTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "LLVMIRGen.h"
-#include "AllocationsInfo.h"
+#include "../../lib/Backends/CPU/LLVMIRGen.h"
+#include "../../lib/Backends/CPU/AllocationsInfo.h"
 
 #include "glow/IR/IR.h"