diff --git a/components/mbedtls/test/test_mbedtls_sha.c b/components/mbedtls/test/test_mbedtls_sha.c
index 721c59b761..b18169827b 100644
--- a/components/mbedtls/test/test_mbedtls_sha.c
+++ b/components/mbedtls/test/test_mbedtls_sha.c
@@ -166,7 +166,7 @@ TEST_CASE("mbedtls SHA self-tests multithreaded", "[mbedtls]")
     xTaskCreate(tskRunSHASelftests, "SHASelftests2", 8192, NULL, 3, NULL);
 
     for(int i = 0; i < 2; i++) {
-        if(!xSemaphoreTake(done_sem, 10000/portTICK_PERIOD_MS)) {
+        if(!xSemaphoreTake(done_sem, 12000/portTICK_PERIOD_MS)) {
             TEST_FAIL_MESSAGE("done_sem not released by test task");
         }
     }
diff --git a/make/project.mk b/make/project.mk
index f41e434393..d30d007dc5 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -178,7 +178,7 @@ endif
 
 
 # Git version of ESP-IDF (of the form v1.0-285-g5c4f707)
-IDF_VER := $(shell git describe)
+IDF_VER := $(shell git -C $(IDF_PATH) describe)
 
 # Set default LDFLAGS