diff --git a/arm-multilib/json/multilib.json b/arm-multilib/json/multilib.json
index 4101e3e1..87fde0e0 100644
--- a/arm-multilib/json/multilib.json
+++ b/arm-multilib/json/multilib.json
@@ -30,31 +30,30 @@
             "json": "aarch64a_strictalign.json",
             "flags": "--target=aarch64-unknown-none-elf -mno-unaligned-access -fno-exceptions -fno-rtti"
         },
-        {
-            "variant": "aarch64a_soft_nofp",
-            "json": "aarch64a_soft_nofp.json",
-            "flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
-            "libraries_supported": "picolibc,newlib"
-        },
-        {
-            "variant": "aarch64a_be_soft_nofp",
-            "json": "aarch64a_be_soft_nofp.json",
-            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
-            "libraries_supported": "picolibc,newlib"
-        },
         {
             "variant": "aarch64a_soft_nofp_exn_rtti",
             "json": "aarch64a_soft_nofp_exn_rtti.json",
             "flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft",
             "libraries_supported": "picolibc,newlib"
         },
+        {
+            "variant": "aarch64a_soft_nofp",
+            "json": "aarch64a_soft_nofp.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
+            "libraries_supported": "picolibc,newlib"
+        },
         {
             "variant": "aarch64a_be_soft_nofp_exn_rtti",
             "json": "aarch64a_be_soft_nofp_exn_rtti.json",
             "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft",
             "libraries_supported": "picolibc,newlib"
         },
-
+        {
+            "variant": "aarch64a_be_soft_nofp",
+            "json": "aarch64a_be_soft_nofp.json",
+            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
+            "libraries_supported": "picolibc,newlib"
+        },
         {
             "variant": "armv4t_exn_rtti",
             "json": "armv4t_exn_rtti.json",
diff --git a/arm-multilib/json/variants/aarch64a_be_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/aarch64a_be_soft_nofp_exn_rtti.json
index b1acc211..f4fc47d0 100644
--- a/arm-multilib/json/variants/aarch64a_be_soft_nofp_exn_rtti.json
+++ b/arm-multilib/json/variants/aarch64a_be_soft_nofp_exn_rtti.json
@@ -4,8 +4,8 @@
             "TARGET_ARCH": "aarch64a",
             "VARIANT": "aarch64a_be_soft_nofp_exn_rtti",
             "COMPILE_FLAGS": "-march=armv8-a+nofp+nosimd -mbig-endian -mabi=aapcs-soft -mno-unaligned-access",
-            "ENABLE_EXCEPTIONS": "OFF",
-            "ENABLE_RTTI": "OFF",
+            "ENABLE_EXCEPTIONS": "ON",
+            "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "fvp",
             "FVP_MODEL": "aem-a",
             "FVP_CONFIG": "v8a-aarch64 big-endian",
diff --git a/arm-multilib/json/variants/aarch64a_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/aarch64a_soft_nofp_exn_rtti.json
index 52781406..90e703e6 100644
--- a/arm-multilib/json/variants/aarch64a_soft_nofp_exn_rtti.json
+++ b/arm-multilib/json/variants/aarch64a_soft_nofp_exn_rtti.json
@@ -4,8 +4,8 @@
             "TARGET_ARCH": "aarch64a",
             "VARIANT": "aarch64a_soft_nofp_exn_rtti",
             "COMPILE_FLAGS": "-march=armv8-a+nofp+nosimd -mabi=aapcs-soft -mno-unaligned-access",
-            "ENABLE_EXCEPTIONS": "OFF",
-            "ENABLE_RTTI": "OFF",
+            "ENABLE_EXCEPTIONS": "ON",
+            "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
             "QEMU_MACHINE": "virt",
             "QEMU_CPU": "cortex-a57",