diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
index dcfc023..b0878fc 100644
--- a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import re
+
 from oslo_log import log as logging
 from tempest.common import utils
 from tempest.common import waiters
@@ -176,7 +178,9 @@
             # The resource class in ironic may be lower case, and must omit the
             # CUSTOM_ prefix. Normalise it.
             node_resource_class = node['resource_class']
-            node_resource_class = node_resource_class.upper()
+            # Replace non-alphanumeric characters with underscores
+            node_resource_class = re.sub(
+                '[^0-9A-Za-z]+', '_', node_resource_class).upper()
             node_resource_class = 'CUSTOM_' + node_resource_class
             self.assertEqual(resource_class, node_resource_class)