diff --git a/src/Common/ShimmerTree/ShimmerTree.tsx b/src/Common/ShimmerTree/ShimmerTree.tsx
index 08616234f..ee2ddc32a 100644
--- a/src/Common/ShimmerTree/ShimmerTree.tsx
+++ b/src/Common/ShimmerTree/ShimmerTree.tsx
@@ -23,7 +23,7 @@ const ShimmerTree = ({ indentLevels, style = {} }: ShimmerTreeProps) => {
   );
 
   return (
-    <Stack tokens={{ childrenGap: 8 }} style={{ width: "50%", ...style }} data-test="shimmer-stack">
+    <Stack tokens={{ childrenGap: 8 }} style={{ width: "50%", ...style }} data-testid="shimmer-stack">
       {indentLevels.map((indentLevel: IndentLevel) => renderShimmers(indentLevel))}
     </Stack>
   );
diff --git a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
index 7378be453..8cab6a608 100644
--- a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
@@ -76,7 +76,7 @@ export const convertButton = (btns: CommandButtonComponentProps[], backgroundCol
         name: label,
         disabled: btn.disabled,
         ariaLabel: btn.ariaLabel,
-        "data-test": `CommandBar/Button:${label}`,
+        "data-testid": `CommandBar/Button:${label}`,
         buttonStyles: {
           root: {
             backgroundColor: backgroundColor,