diff --git a/samples/subsys/tracing/boards/mps2_an521.overlay b/samples/subsys/tracing/boards/mps2_an521_cpu0.overlay
similarity index 100%
rename from samples/subsys/tracing/boards/mps2_an521.overlay
rename to samples/subsys/tracing/boards/mps2_an521_cpu0.overlay
diff --git a/tests/drivers/coredump/coredump_api/boards/qemu_riscv32_qemu_virt_riscv32_smp.overlay b/tests/drivers/coredump/coredump_api/boards/qemu_riscv32_qemu_virt_riscv32_smp.overlay
new file mode 100644
index 00000000000..ce40ceadeb8
--- /dev/null
+++ b/tests/drivers/coredump/coredump_api/boards/qemu_riscv32_qemu_virt_riscv32_smp.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright Meta Platforms, Inc. and its affiliates.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "qemu_riscv32.overlay"
diff --git a/tests/lib/shared_multi_heap/boards/mps2_an521.overlay b/tests/lib/shared_multi_heap/boards/mps2_an521_cpu0.overlay
similarity index 100%
rename from tests/lib/shared_multi_heap/boards/mps2_an521.overlay
rename to tests/lib/shared_multi_heap/boards/mps2_an521_cpu0.overlay