diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 8409ca7..af42b87 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -265,9 +265,6 @@
                     # MUSCA_S1_GCC_1_REG_Debug_BL2
                     ("arm/musca_s1", "GCC_10_3", "1",
                      True, "OFF", "Debug", True, "", ""),
-                    # MUSCA_S1_GCC_2_REG_Release_BL2_FPON
-                    ("arm/musca_s1", "GCC_10_3", "2",
-                     True, "OFF", "Release", True, "", "FPON"),
                     # MUSCA_S1_GCC_1_REG_Release_BL2_CC_DRIVER_PSA
                     ("arm/musca_s1", "GCC_10_3", "1",
                      True, "OFF", "Release", True, "", "CC_DRIVER_PSA"),
@@ -438,7 +435,8 @@
                 }
 
 config_fp = {"seed_params": {
-                "tfm_platform":     ["arm/musca_s1"],
+                "tfm_platform":     ["arm/mps2/an521",
+                                     "arm/mps3/an552"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1", "2"],
                 "test_regression":  [True],
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index e8996a5..0cee521 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -97,7 +97,8 @@
     },
     "monitors": {
         'no_reg_tests': [monitors_no_reg_tests],
-        'reg_tests': [monitors_mcuboot_tests, monitors_s_reg_tests, monitors_ns_reg_tests],
+        # FPU test on FPGA not supported yet
+        'reg_tests': [monitors_mcuboot_tests, monitors_s_reg_tests, monitors_ns_reg_tests] if 'FPON' not in os.getenv("EXTRA_PARAMS") else [],
         'arch_tests': [monitors_arch_tests] if os.getenv("TEST_PSA_API") != "IPC" else [], # FF test on FPGA not supported in LAVA yet
     }
 }
@@ -210,7 +211,8 @@
         "bootloader": "bl2.bin"
     },
     "monitors": {
-        'reg_tests': [monitors_mcuboot_tests, monitors_s_reg_tests, monitors_ns_reg_tests],
+        # FPU test on AN521 qemu not supported yet
+        'reg_tests': [monitors_mcuboot_tests, monitors_s_reg_tests, monitors_ns_reg_tests] if 'FPON' not in os.getenv("EXTRA_PARAMS") else [],
     }
 }