diff --git a/.azure/templates/build-test.yml b/.azure/templates/build-test.yml
index 9f92738cef..58d13b3c70 100644
--- a/.azure/templates/build-test.yml
+++ b/.azure/templates/build-test.yml
@@ -119,7 +119,7 @@ steps:
       fi
       crosscompiling=
       if [[ "${SHAREDLIBS:-on}" == "off" ]] ; then
-        PATH="${BUILD_SOURCESDIRECTORY}/build-sharedlibs/install/bin:${PATH}"
+        prefix_path="${BUILD_SOURCESDIRECTORY}/build-sharedlibs/install:${prefix_path}"
         crosscompiling="-DCMAKE_CROSSCOMPILING=1 -DCMAKE_SYSTEM_NAME=${AGENT_OS}"
       fi
       cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
diff --git a/src/core/ddsc/CMakeLists.txt b/src/core/ddsc/CMakeLists.txt
index 1c0beb545c..dd21a6772d 100644
--- a/src/core/ddsc/CMakeLists.txt
+++ b/src/core/ddsc/CMakeLists.txt
@@ -133,7 +133,6 @@ install(
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   COMPONENT dev)
 
-# TODO: improve test inclusion.
-if((BUILD_TESTING) AND (BUILD_IDLC) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800")))
+if((BUILD_TESTING) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800")))
   add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tests")
 endif()
diff --git a/src/security/core/CMakeLists.txt b/src/security/core/CMakeLists.txt
index c4cbbc7f34..418fb3eb45 100644
--- a/src/security/core/CMakeLists.txt
+++ b/src/security/core/CMakeLists.txt
@@ -45,7 +45,7 @@ target_include_directories(security_core
         "$<BUILD_INTERFACE:$<TARGET_PROPERTY:ddsc,INTERFACE_INCLUDE_DIRECTORIES>>"
 )
 
-if(BUILD_TESTING AND BUILD_IDLC)
+if(BUILD_TESTING)
   add_subdirectory(tests)
 endif()