diff --git a/deployments/env-test/env_test.cmake b/deployments/env-test/env_test.cmake
index 87a3298..bebd9f5 100644
--- a/deployments/env-test/env_test.cmake
+++ b/deployments/env-test/env_test.cmake
@@ -44,9 +44,10 @@
 #
 #-------------------------------------------------------------------------------
 
+# Get libc include dir
+get_property(LIBC_INCLUDE_PATH TARGET c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
 # Mbed TLS provides libmbedcrypto
-list(APPEND MBEDTLS_EXTRA_INCLUDES ${SP_DEV_KIT_INCLUDE_DIR})
-set(MBEDTLS_EXTRA_INCLUDES ${MBEDTLS_EXTRA_INCLUDES}
-	CACHE STRING "PSA ITS for Mbed TLS" FORCE)
+list(APPEND MBEDTLS_EXTRA_INCLUDES ${LIBC_INCLUDE_PATH})
 include(${TS_ROOT}/external/MbedTLS/MbedTLS.cmake)
 target_link_libraries(env-test PRIVATE mbedcrypto)
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index d75f74f..58f9c02 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -24,14 +24,6 @@
 set(SP_UUID "33c75baf-ac6a-4fe4-8ac7-e9909bee2d17")
 set(TRACE_PREFIX "ENVTEST" CACHE STRING "Trace prefix")
 
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET env-test DEFINES ARM64=1)
-target_link_libraries(env-test PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
 #-------------------------------------------------------------------------------
 #  Components that are env-test specific to deployment in the opteesp
 #  environment.