diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index 777d307..63262f8 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -365,6 +365,69 @@
 )
 
 sec_flash_binary(
+    name = "isp_wrapper_irq_test",
+    srcs = [
+        "simple_sec.c",
+        "//sw/device/tests/smc:smc_isp_wrapper_irq_test_fpga_nexus_bin_c.h",
+    ],
+    copts = [
+        "-nostdlib",
+        "-ffreestanding",
+    ],
+    defines = [
+        "ISP_IRQ_TEST",
+        "HAS_SMC_BIN",
+    ],
+    per_device_deps = sec_fpga_device,
+    deps = [
+        ":test_lib",
+        "//sw/device/lib/dif:smc_ctrl",
+    ],
+)
+
+sec_flash_binary(
+    name = "isp_wrapper_tpg_64_64_test",
+    srcs = [
+        "simple_sec.c",
+        "//sw/device/tests/smc:smc_isp_wrapper_tpg_64_64_test_fpga_nexus_bin_c.h",
+    ],
+    copts = [
+        "-nostdlib",
+        "-ffreestanding",
+    ],
+    defines = [
+        "ISP_TPG_64_64_TEST",
+        "HAS_SMC_BIN",
+    ],
+    per_device_deps = sec_fpga_device,
+    deps = [
+        ":test_lib",
+        "//sw/device/lib/dif:smc_ctrl",
+    ],
+)
+
+sec_flash_binary(
+    name = "ml_top_irq_test",
+    srcs = [
+        "simple_sec.c",
+        "//sw/device/tests/smc:smc_ml_top_irq_test_fpga_nexus_bin_c.h",
+    ],
+    copts = [
+        "-nostdlib",
+        "-ffreestanding",
+    ],
+    defines = [
+        "ML_TOP_IRQ_TEST",
+        "HAS_SMC_BIN",
+    ],
+    per_device_deps = sec_fpga_device,
+    deps = [
+        ":test_lib",
+        "//sw/device/lib/dif:smc_ctrl",
+    ],
+)
+
+sec_flash_binary(
     name = "dma_main_test",
     srcs = [
         "dma_main.c",
diff --git a/sw/device/tests/simple_sec.c b/sw/device/tests/simple_sec.c
index fc7b029..f1283b6 100644
--- a/sw/device/tests/simple_sec.c
+++ b/sw/device/tests/simple_sec.c
@@ -36,6 +36,12 @@
 #include "sw/device/tests/smc/smc_virtual_memory_test_fpga_nexus_bin_c.h"
 #elif defined(ATOMICS_TEST)
 #include "sw/device/tests/smc/smc_atomics_test_fpga_nexus_bin_c.h"
+#elif defined(ISP_IRQ_TEST)
+#include "sw/device/tests/smc/smc_isp_wrapper_irq_test_fpga_nexus_bin_c.h"
+#elif defined(ISP_TPG_64_64_TEST)
+#include "sw/device/tests/smc/smc_isp_wrapper_tpg_64_64_test_fpga_nexus_bin_c.h"
+#elif defined(ML_TOP_IRQ_TEST)
+#include "sw/device/tests/smc/smc_ml_top_irq_test_fpga_nexus_bin_c.h"
 #endif
 
 OTTF_DEFINE_TEST_CONFIG();
@@ -62,10 +68,14 @@
 
 #if defined(CAM_I2C_TEST)
   CHECK_DIF_OK(pinmux_testutils_configure_cam_i2c(&pinmux));
-  CHECK_DIF_OK(pinmux_testutils_configure_isp_wrapper(&pinmux));
   CHECK_DIF_OK(pinmux_testutils_configure_cam_ctrl(&pinmux));
 #endif
 
+#if defined(CAM_I2C_TEST) || defined(ISP_IRQ_TEST) || \
+    defined(ISP_TPG_64_64_TEST)
+  CHECK_DIF_OK(pinmux_testutils_configure_isp_wrapper(&pinmux));
+#endif
+
 #if defined(HAS_SMC_BIN)
   if (kDeviceType == kDeviceFpgaNexus) {
     memcpy((void*)TOP_MATCHA_RAM_SMC_BASE_ADDR, smc_bin, smc_bin_len);