diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 897e612173..f7687bfca4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1187,6 +1187,12 @@ UT_001_38:
     - ESP32_IDF
     - UT_T1_1
 
+UT_001_39:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_1
+
 UT_002_01:
   <<: *unit_test_template
   tags:
@@ -1719,4 +1725,4 @@ IT_015_01:
   <<: *test_template
   tags:
     - ESP32_IDF
-    - SSC_T2_4
\ No newline at end of file
+    - SSC_T2_4
diff --git a/components/esp32/hwcrypto/aes.c b/components/esp32/hwcrypto/aes.c
index 9c449d821c..a14dc51ed5 100644
--- a/components/esp32/hwcrypto/aes.c
+++ b/components/esp32/hwcrypto/aes.c
@@ -431,7 +431,7 @@ static int esp_aes_xts_decode_keys( const unsigned char *key,
     return 0;
 }
 
-int esp_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
+int esp_aes_xts_setkey_enc( esp_aes_xts_context *ctx,
                                 const unsigned char *key,
                                 unsigned int keybits)
 {
@@ -453,7 +453,7 @@ int esp_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
     return esp_aes_setkey( &ctx->crypt, key1, key1bits );
 }
 
-int esp_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
+int esp_aes_xts_setkey_dec( esp_aes_xts_context *ctx,
                                 const unsigned char *key,
                                 unsigned int keybits)
 {
@@ -532,7 +532,7 @@ static void esp_gf128mul_x_ble( unsigned char r[16],
 /*
  * AES-XTS buffer encryption/decryption
  */
-int esp_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
+int esp_aes_crypt_xts( esp_aes_xts_context *ctx,
                            int mode,
                            size_t length,
                            const unsigned char data_unit[16],
diff --git a/tools/unit-test-app/configs/aes_no_hw b/tools/unit-test-app/configs/aes_no_hw
new file mode 100644
index 0000000000..f890e3f81c
--- /dev/null
+++ b/tools/unit-test-app/configs/aes_no_hw
@@ -0,0 +1,3 @@
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update
+TEST_COMPONENTS=mbedtls
+CONFIG_MBEDTLS_HARDWARE_AES=n