diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 71223b2f216f0b..0137ea27ac8591 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -670,7 +670,7 @@ jobs:
       set -e
       . util/build_consts.sh
       module load "xilinx/vivado/$(VIVADO_VERSION)"
-      ci/scripts/run-fpga-tests.sh cw310 fpga_cw310_rom_ext_tests || { res=$?; echo "To reproduce failures locally, follow the instructions at https://opentitan.org/book/doc/getting_started/setup_fpga.html#reproducing-fpga-ci-failures-locally"; exit "${res}"; }
+      ci/scripts/run-fpga-tests.sh hyper310 fpga_hyper310_rom_ext_tests || { res=$?; echo "To reproduce failures locally, follow the instructions at https://opentitan.org/book/doc/getting_started/setup_fpga.html#reproducing-fpga-ci-failures-locally"; exit "${res}"; }
     displayName: Execute tests
   - template: ci/publish-bazel-test-results.yml
 
diff --git a/ci/scripts/run-fpga-tests.sh b/ci/scripts/run-fpga-tests.sh
index 4cb98e786326ff..f90aab0ee1dd14 100755
--- a/ci/scripts/run-fpga-tests.sh
+++ b/ci/scripts/run-fpga-tests.sh
@@ -84,9 +84,9 @@ then
     > "${pattern_file}"
     # We need to remove tests tagged as manual since we are not using a wildcard target.
     test_args="${test_args} --test_tag_filters=cw310_sival,-broken,-skip_in_ci,-manual"
-elif [ "${fpga_tags}" == "fpga_cw310_rom_ext_tests" ]
+elif [ "${fpga_tags}" == "fpga_hyper310_rom_ext_tests" ]
 then
-    test_args="${test_args} --test_tag_filters=cw310_rom_ext,-broken,-skip_in_ci"
+    test_args="${test_args} --test_tag_filters=hyper310_rom_ext,-broken,-skip_in_ci"
     echo "//sw/device/silicon_creator/rom_ext/e2e/..." > "${pattern_file}"
 else
     test_args="${test_args} --test_tag_filters=${fpga_tags},-broken,-skip_in_ci"
diff --git a/rules/opentitan/defs.bzl b/rules/opentitan/defs.bzl
index 1e4b11ec94ced5..8fc9f1bc755613 100644
--- a/rules/opentitan/defs.bzl
+++ b/rules/opentitan/defs.bzl
@@ -120,7 +120,9 @@ def _parameter_name(env, pname):
 def _hacky_tags(env):
     (_, suffix) = env.split(":")
     tags = []
-    if suffix.startswith("fpga_cw310_") or suffix.startswith("fpga_cw340_"):
+    if (suffix.startswith("fpga_cw310_") or
+        suffix.startswith("fpga_cw340_") or
+        suffix.startswith("fpga_hyper310")):
         # We have tags like "cw310_rom_with_real_keys" or "cw310_test_rom"
         # applied to our tests.  Since there is no way to adjust tags in a
         # rule's implementation, we have to infer these tag names from the