diff --git a/applications/debug/unit_tests/application.fam b/applications/debug/unit_tests/application.fam
index 949bb3fc..ad9a278f 100644
--- a/applications/debug/unit_tests/application.fam
+++ b/applications/debug/unit_tests/application.fam
@@ -3,6 +3,7 @@ App(
     apptype=FlipperAppType.STARTUP,
     entry_point="unit_tests_on_system_start",
     cdefines=["APP_UNIT_TESTS"],
+    requires=["system_settings"],
     provides=["delay_test"],
     order=100,
 )
diff --git a/applications/debug/unit_tests/subghz/subghz_test.c b/applications/debug/unit_tests/subghz/subghz_test.c
index 6bdaa641..e32a5748 100644
--- a/applications/debug/unit_tests/subghz/subghz_test.c
+++ b/applications/debug/unit_tests/subghz/subghz_test.c
@@ -330,7 +330,12 @@ bool subghz_hal_async_tx_test_run(SubGhzHalAsyncTxTestType type) {
         return false;
     }
 
+    FuriHalCortexTimer timer = furi_hal_cortex_timer_get(30000000);
+
     while(!furi_hal_subghz_is_async_tx_complete()) {
+        if(furi_hal_cortex_timer_is_expired(timer)) {
+            return false;
+        }
         furi_delay_ms(10);
     }
     furi_hal_subghz_stop_async_tx();
diff --git a/applications/services/loader/firmware_api/firmware_api.cpp b/applications/services/loader/firmware_api/firmware_api.cpp
index 6651bf11..47554f62 100644
--- a/applications/services/loader/firmware_api/firmware_api.cpp
+++ b/applications/services/loader/firmware_api/firmware_api.cpp
@@ -10,6 +10,19 @@
 
 static_assert(!has_hash_collisions(elf_api_table), "Detected API method hash collision!");
 
+#ifdef APP_UNIT_TESTS
+constexpr HashtableApiInterface mock_elf_api_interface{
+    {
+        .api_version_major = 0,
+        .api_version_minor = 0,
+        .resolver_callback = &elf_resolve_from_hashtable,
+    },
+    .table_cbegin = nullptr,
+    .table_cend = nullptr,
+};
+
+const ElfApiInterface* const firmware_api_interface = &mock_elf_api_interface;
+#else
 constexpr HashtableApiInterface elf_api_interface{
     {
         .api_version_major = (elf_api_version >> 16),
@@ -19,10 +32,10 @@ constexpr HashtableApiInterface elf_api_interface{
     .table_cbegin = elf_api_table.cbegin(),
     .table_cend = elf_api_table.cend(),
 };
-
 const ElfApiInterface* const firmware_api_interface = &elf_api_interface;
+#endif
 
 extern "C" void furi_hal_info_get_api_version(uint16_t* major, uint16_t* minor) {
-    *major = elf_api_interface.api_version_major;
-    *minor = elf_api_interface.api_version_minor;
+    *major = firmware_api_interface->api_version_major;
+    *minor = firmware_api_interface->api_version_minor;
 }
\ No newline at end of file