diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt
index 3b1fd504e2..44af366f45 100644
--- a/components/mbedtls/CMakeLists.txt
+++ b/components/mbedtls/CMakeLists.txt
@@ -2,8 +2,6 @@ set(COMPONENT_ADD_INCLUDEDIRS "port/include" "mbedtls/include")
 set(COMPONENT_SRCS "mbedtls.c")
 set(COMPONENT_REQUIRES lwip)
 
-set(MBEDTLS_PRIV_REQUIRES ${IDF_COMPONENT_REQUIRES_COMMON} soc)
-
 register_component()
 
 # Only build mbedtls libraries
@@ -96,9 +94,4 @@ foreach(target ${mbedtls_targets})
 endforeach()
 
 # Link mbedtls libraries to component library
-target_link_libraries(${COMPONENT_LIB} ${mbedtls_targets})
-
-# Catch usage of deprecated mbedTLS functions when building tests
-if(mbedtls_test IN_LIST BUILD_TEST_COMPONENTS)
-    add_definitions(-DMBEDTLS_DEPRECATED_WARNING)
-endif()
\ No newline at end of file
+target_link_libraries(${COMPONENT_LIB} ${mbedtls_targets})
\ No newline at end of file
diff --git a/components/mbedtls/test/CMakeLists.txt b/components/mbedtls/test/CMakeLists.txt
index e1aad74fac..5a8cfd8d33 100644
--- a/components/mbedtls/test/CMakeLists.txt
+++ b/components/mbedtls/test/CMakeLists.txt
@@ -4,3 +4,9 @@ set(COMPONENT_ADD_INCLUDEDIRS ".")
 set(COMPONENT_REQUIRES unity test_utils mbedtls)
 
 register_component()
+
+idf_component_get_property(mbedtls mbedtls COMPONENT_LIB)
+target_compile_definitions(${mbedtls} PUBLIC "-DMBEDTLS_DEPRECATED_WARNING")
+target_compile_definitions(mbedtls PUBLIC "-DMBEDTLS_DEPRECATED_WARNING")
+target_compile_definitions(mbedcrypto PUBLIC "-DMBEDTLS_DEPRECATED_WARNING")
+target_compile_definitions(mbedx509 PUBLIC "-DMBEDTLS_DEPRECATED_WARNING")