diff --git a/components/idf_test/include/esp32s2/idf_performance_target.h b/components/idf_test/include/esp32s2/idf_performance_target.h
index 3895361dee..5d64e1fbb2 100644
--- a/components/idf_test/include/esp32s2/idf_performance_target.h
+++ b/components/idf_test/include/esp32s2/idf_performance_target.h
@@ -20,7 +20,7 @@
 #define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP                              650000
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP                               36000
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP                              960000
-#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               62000
+#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               70000
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP                              2850000
 
 #define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER                 3
diff --git a/components/idf_test/include/esp32s3/idf_performance_target.h b/components/idf_test/include/esp32s3/idf_performance_target.h
index 071f0db403..e6f10be50e 100644
--- a/components/idf_test/include/esp32s3/idf_performance_target.h
+++ b/components/idf_test/include/esp32s3/idf_performance_target.h
@@ -14,11 +14,11 @@
 #define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB                                      1000
 #define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB                                    900
 
-#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP                               23000
+#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP                               24000
 #define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP                              700000
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP                               45000
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP                              1300000
-#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               80000
+#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               90000
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP                              3500000
 
 // floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround)
diff --git a/components/mbedtls/test_apps/main/test_psa_rsa.c b/components/mbedtls/test_apps/main/test_psa_rsa.c
index 6cc9e1c5f9..84bec7b699 100644
--- a/components/mbedtls/test_apps/main/test_psa_rsa.c
+++ b/components/mbedtls/test_apps/main/test_psa_rsa.c
@@ -292,7 +292,7 @@ TEST_CASE("test performance RSA key operations", "[bignum]")
         if (keysize == PSA_RSA_KEY_SIZE_2048) {
             TEST_PERFORMANCE_CCOMP_LESS_THAN(RSA_2048KEY_PUBLIC_OP, "%d us", public_perf);
             TEST_PERFORMANCE_CCOMP_LESS_THAN(RSA_2048KEY_PRIVATE_OP, "%d us", private_perf);
-        } else if (keysize == 4096) {
+        } else if (keysize == PSA_RSA_KEY_SIZE_4096) {
             TEST_PERFORMANCE_CCOMP_LESS_THAN(RSA_4096KEY_PUBLIC_OP, "%d us", public_perf);
             TEST_PERFORMANCE_CCOMP_LESS_THAN(RSA_4096KEY_PRIVATE_OP, "%d us", private_perf);
         }
diff --git a/components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw b/components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw
index aadb89a893..a41285ede3 100644
--- a/components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw
+++ b/components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw
@@ -1,2 +1 @@
 CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_MPI_USE_INTERRUPT=n