diff --git a/hw/vendor/lowrisc_ip/ip/spi_device/data/spi_device_testplan.hjson b/hw/vendor/lowrisc_ip/ip/spi_device/data/spi_device_testplan.hjson
index 352fc89f2..53ae65702 100644
--- a/hw/vendor/lowrisc_ip/ip/spi_device/data/spi_device_testplan.hjson
+++ b/hw/vendor/lowrisc_ip/ip/spi_device/data/spi_device_testplan.hjson
@@ -14,12 +14,11 @@
     {
       name: smoke
       desc: '''
-            Configures Flash/Passthrough modes as well as TPM and drive reads/writes
-            through SPI alternating between TPM and SPI commands.
-            Sequences spi_device_flash_all_vseq and spi_device_tpm_all_vseq are
-            launched in parallel'''
+            Configures FlashMode and drives a randomised sequence of read commands,
+            exercising the read buffer along with the intercepted status, JEDEC and
+            SFDP commands.'''
       stage: V1
-      tests: ["spi_device_flash_and_tpm"]
+      tests: ["spi_device_flash_mode"]
     }
     {
       name: csb_read
diff --git a/hw/vendor/patches/lowrisc_ip/spi_device/0005_align_smoke_testpoint.patch b/hw/vendor/patches/lowrisc_ip/spi_device/0005_align_smoke_testpoint.patch
new file mode 100644
index 000000000..55c30a7cd
--- /dev/null
+++ b/hw/vendor/patches/lowrisc_ip/spi_device/0005_align_smoke_testpoint.patch
@@ -0,0 +1,20 @@
+diff --git a/data/spi_device_testplan.hjson b/data/spi_device_testplan.hjson
+--- a/data/spi_device_testplan.hjson
++++ b/data/spi_device_testplan.hjson
+@@ -14,12 +14,11 @@
+     {
+       name: smoke
+       desc: '''
+-            Configures Flash/Passthrough modes as well as TPM and drive reads/writes
+-            through SPI alternating between TPM and SPI commands.
+-            Sequences spi_device_flash_all_vseq and spi_device_tpm_all_vseq are
+-            launched in parallel'''
++            Configures FlashMode and drives a randomised sequence of read commands,
++            exercising the read buffer along with the intercepted status, JEDEC and
++            SFDP commands.'''
+       stage: V1
+-      tests: ["spi_device_flash_and_tpm"]
++      tests: ["spi_device_flash_mode"]
+     }
+     {
+       name: csb_read