diff --git a/hw/top_earlgrey/dv/chip_sim_cfg.hjson b/hw/top_earlgrey/dv/chip_sim_cfg.hjson
index 053d9a0c1e5a5d..d890d89d30ace0 100644
--- a/hw/top_earlgrey/dv/chip_sim_cfg.hjson
+++ b/hw/top_earlgrey/dv/chip_sim_cfg.hjson
@@ -694,7 +694,7 @@
     {
       name: chip_sw_spi_device_tpm
       uvm_test_seq: chip_sw_spi_device_tpm_vseq
-      sw_images: ["//sw/device/tests/sim_dv:spi_device_tpm_tx_rx_test:1:new_rules"]
+      sw_images: ["//sw/device/tests:spi_device_tpm_tx_rx_test:1:new_rules"]
       en_run_modes: ["sw_test_mode_test_rom"]
     }
     {
diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index b7e1147a52f5fd..3e066f9bb33e8d 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -2917,6 +2917,42 @@ opentitan_test(
     ],
 )
 
+opentitan_test(
+    name = "spi_device_tpm_tx_rx_test",
+    srcs = ["spi_device_tpm_tx_rx_test.c"],
+    cw310 = new_cw310_params(
+        # This test requires the spi full duplex on the hyperdebug board.
+        tags = [
+            "broken",
+            "manual",
+        ],
+        test_cmd = """
+            --bitstream="{bitstream}"
+            --bootstrap="{firmware}"
+            "{firmware:elf}"
+        """,
+        test_harness = "//sw/host/tests/chip/spi_device_tpm_test",
+    ),
+    exec_env = {
+        "//hw/top_earlgrey:fpga_cw310_sival": None,
+        "//hw/top_earlgrey:sim_dv": None,
+    },
+    deps = [
+        "//hw/top_earlgrey/sw/autogen:top_earlgrey",
+        "//sw/device/lib/arch:device",
+        "//sw/device/lib/base:mmio",
+        "//sw/device/lib/dif:pinmux",
+        "//sw/device/lib/dif:rv_plic",
+        "//sw/device/lib/dif:spi_device",
+        "//sw/device/lib/runtime:hart",
+        "//sw/device/lib/runtime:irq",
+        "//sw/device/lib/runtime:log",
+        "//sw/device/lib/testing:isr_testutils",
+        "//sw/device/lib/testing/test_framework:ottf_main",
+        "//sw/device/lib/testing/test_framework:status",
+    ],
+)
+
 cc_library(
     name = "spi_host_flash_test_impl",
     srcs = ["spi_host_flash_test_impl.c"],
diff --git a/sw/device/tests/sim_dv/BUILD b/sw/device/tests/sim_dv/BUILD
index 0b0f5c2a213b5d..d2b10974e03507 100644
--- a/sw/device/tests/sim_dv/BUILD
+++ b/sw/device/tests/sim_dv/BUILD
@@ -671,26 +671,6 @@ opentitan_test(
     ],
 )
 
-opentitan_test(
-    name = "spi_device_tpm_tx_rx_test",
-    srcs = ["spi_device_tpm_tx_rx_test.c"],
-    exec_env = {"//hw/top_earlgrey:sim_dv": None},
-    deps = [
-        "//hw/top_earlgrey/sw/autogen:top_earlgrey",
-        "//sw/device/lib/arch:device",
-        "//sw/device/lib/base:mmio",
-        "//sw/device/lib/dif:pinmux",
-        "//sw/device/lib/dif:rv_plic",
-        "//sw/device/lib/dif:spi_device",
-        "//sw/device/lib/runtime:hart",
-        "//sw/device/lib/runtime:irq",
-        "//sw/device/lib/runtime:log",
-        "//sw/device/lib/testing:isr_testutils",
-        "//sw/device/lib/testing/test_framework:ottf_main",
-        "//sw/device/lib/testing/test_framework:status",
-    ],
-)
-
 opentitan_test(
     name = "spi_host_tx_rx_test",
     srcs = ["spi_host_tx_rx_test.c"],
diff --git a/sw/device/tests/sim_dv/spi_device_tpm_tx_rx_test.c b/sw/device/tests/spi_device_tpm_tx_rx_test.c
similarity index 99%
rename from sw/device/tests/sim_dv/spi_device_tpm_tx_rx_test.c
rename to sw/device/tests/spi_device_tpm_tx_rx_test.c
index 3c951cb605f291..5df097e9ca96d7 100644
--- a/sw/device/tests/sim_dv/spi_device_tpm_tx_rx_test.c
+++ b/sw/device/tests/spi_device_tpm_tx_rx_test.c
@@ -164,13 +164,13 @@ bool test_main(void) {
       &pinmux, kTopEarlgreyPinmuxPeripheralInSpiDeviceTpmCsb,
       kTopEarlgreyPinmuxInselIoa7));
 
-  if (kDeviceType == kDeviceSimDV){
+  if (kDeviceType == kDeviceSimDV) {
     dif_pinmux_pad_attr_t out_attr;
     dif_pinmux_pad_attr_t in_attr = {
         .slew_rate = 0,
         .drive_strength = 0,
         .flags = kDifPinmuxPadAttrPullResistorEnable |
-                kDifPinmuxPadAttrPullResistorUp};
+                 kDifPinmuxPadAttrPullResistorUp};
 
     CHECK_DIF_OK(dif_pinmux_pad_write_attrs(&pinmux, kTopEarlgreyMuxedPadsIoa7,
                                             kDifPinmuxPadKindMio, in_attr,