diff --git a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
deleted file mode 100644
index 28c14ca98cc..00000000000
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Config for qemu-riscv64 S-mode (requires OpenSBI)
-
-console_impl=qemu
-qemu_machine="virt"
-qemu_binary="qemu-system-riscv64"
-qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
-qemu_kernel_args="-bios ${OPENSBI} -kernel ${U_BOOT_BUILD_DIR}/u-boot.bin"
-reset_impl=none
-flash_impl=none
diff --git a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
new file mode 120000
index 00000000000..c6949f825df
--- /dev/null
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
@@ -0,0 +1 @@
+../travis-ci/conf.qemu-riscv64_smode_acpi_na
\ No newline at end of file
diff --git a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
deleted file mode 100644
index 28c14ca98cc..00000000000
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Config for qemu-riscv64 S-mode (requires OpenSBI)
-
-console_impl=qemu
-qemu_machine="virt"
-qemu_binary="qemu-system-riscv64"
-qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
-qemu_kernel_args="-bios ${OPENSBI} -kernel ${U_BOOT_BUILD_DIR}/u-boot.bin"
-reset_impl=none
-flash_impl=none
diff --git a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
new file mode 120000
index 00000000000..0e14d27c99e
--- /dev/null
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
@@ -0,0 +1 @@
+../travis-ci/conf.qemu-riscv64_smode_na
\ No newline at end of file
diff --git a/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_acpi_na b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_acpi_na
new file mode 100644
index 00000000000..ebc3e7d3775
--- /dev/null
+++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_acpi_na
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2025 Heinrich Schuchardt
+
+console_impl=qemu
+qemu_machine="virt,acpi=on"
+qemu_binary="qemu-system-riscv64"
+qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
+qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+reset_impl=none
+flash_impl=none
diff --git a/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_na b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_na
new file mode 100644
index 00000000000..ebc3e7d3775
--- /dev/null
+++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_na
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2025 Heinrich Schuchardt
+
+console_impl=qemu
+qemu_machine="virt,acpi=on"
+qemu_binary="qemu-system-riscv64"
+qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
+qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+reset_impl=none
+flash_impl=none