diff --git a/components/src/instrument/PipetteSelect.js b/components/src/instrument/PipetteSelect.js
index 968ee79ea79..3079cefe1be 100644
--- a/components/src/instrument/PipetteSelect.js
+++ b/components/src/instrument/PipetteSelect.js
@@ -119,7 +119,7 @@ const PipetteNameItem = (props: PipetteNameSpecs) => {
 
   return (
     <Flex
-      data-id={dataIdFormat(
+      data-test={dataIdFormat(
         'PipetteNameItem',
         volumeClass,
         channels,
diff --git a/protocol-designer/cypress/integration/newProtocolWithModules.spec.js b/protocol-designer/cypress/integration/newProtocolWithModules.spec.js
index e8d899cd876..591c5747cad 100644
--- a/protocol-designer/cypress/integration/newProtocolWithModules.spec.js
+++ b/protocol-designer/cypress/integration/newProtocolWithModules.spec.js
@@ -44,7 +44,7 @@ describe('Protocols with Modules', () => {
         .next()
         .contains('None')
         .click()
-      cy.get('[data-id="PipetteNameItem_p300MultiChannelGen1"]').click()
+      cy.get('[data-test="PipetteNameItem_p300MultiChannelGen1"]').click()
       cy.selectTipRacks(tipRack, tipRack)
 
       // Add modules