diff --git a/VAMobile/src/components/AccordionCollapsible.tsx b/VAMobile/src/components/AccordionCollapsible.tsx
index 8b77b218ace..c473581fe58 100644
--- a/VAMobile/src/components/AccordionCollapsible.tsx
+++ b/VAMobile/src/components/AccordionCollapsible.tsx
@@ -4,7 +4,6 @@ import { Pressable, PressableProps, View } from 'react-native'
 
 import { Events } from 'constants/analytics'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { useTheme } from 'utils/hooks'
 
@@ -113,7 +112,7 @@ const AccordionCollapsible: FC<AccordionCollapsibleProps> = ({
   }
 
   return (
-    <Box {...boxProps} {...testIdProps('accordion-wrapper', true)} testID={testID} importantForAccessibility={'no'}>
+    <Box {...boxProps} testID={testID} importantForAccessibility={'no'}>
       <TextArea noBorder={noBorder}>
         {renderHeader()}
         {!expanded && collapsedContent}
diff --git a/VAMobile/src/components/BackButton.tsx b/VAMobile/src/components/BackButton.tsx
index 16113babd10..be28dd47364 100644
--- a/VAMobile/src/components/BackButton.tsx
+++ b/VAMobile/src/components/BackButton.tsx
@@ -6,7 +6,7 @@ import { useFocusEffect } from '@react-navigation/native'
 
 import { BackButtonLabel } from 'constants/backButtonLabels'
 import { NAMESPACE } from 'constants/namespaces'
-import { a11yHintProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp } from 'utils/accessibility'
 import { useAccessibilityFocus, useTheme } from 'utils/hooks'
 
 import Box from './Box'
@@ -67,7 +67,7 @@ export const BackButton: FC<BackButtonProps> = ({
     <TouchableWithoutFeedback
       ref={focusRef}
       onPress={onPress}
-      {...testIdProps(label)}
+      accessibilityLabel={label}
       {...a11yHintProp(a11yHintPropParam)}
       accessibilityRole="button"
       accessible={true}
diff --git a/VAMobile/src/components/BaseListItem.tsx b/VAMobile/src/components/BaseListItem.tsx
index 47b56f8801e..e4654023dc8 100644
--- a/VAMobile/src/components/BaseListItem.tsx
+++ b/VAMobile/src/components/BaseListItem.tsx
@@ -3,7 +3,7 @@ import { AccessibilityProps, AccessibilityRole, AccessibilityState, Pressable, P
 import { HapticFeedbackTypes } from 'react-native-haptic-feedback'
 
 import FileRequestNumberIndicator from 'screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/FileRequestNumberIndicator'
-import { a11yHintProp, a11yValueProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp, a11yValueProp } from 'utils/accessibility'
 import { triggerHaptic } from 'utils/haptics'
 import { useTheme } from 'utils/hooks'
 
@@ -254,10 +254,10 @@ const BaseListItem: FC<BaseListItemProps> = (props) => {
   }
 
   const a11yProps: AccessibilityProps = {
-    ...testIdProps(testId || ''),
     ...a11yHintProp(a11yHint),
     ...a11yValueProp(a11yValue ? { text: a11yValue } : {}),
     accessibilityState: a11yState ? a11yState : {},
+    accessibilityLabel: testId,
   }
 
   if (isSwitchRow && decoratorProps) {
@@ -270,7 +270,7 @@ const BaseListItem: FC<BaseListItemProps> = (props) => {
   const generateItem = (accessibilityProps?: AccessibilityProps): ReactElement => {
     // accessible property set to true when there is no onPress because it is already wrapped in the accessible Pressable
     return (
-      <Box {...boxProps} {...accessibilityProps} accessible={!onPress}>
+      <Box {...boxProps} {...accessibilityProps} testID={accessibilityProps?.accessibilityLabel} accessible={!onPress}>
         {claimsRequestNumber !== undefined ? (
           <FileRequestNumberIndicator requestNumber={claimsRequestNumber} fileUploaded={fileUploaded} />
         ) : (
@@ -289,7 +289,7 @@ const BaseListItem: FC<BaseListItemProps> = (props) => {
   // onPress exist, wrap in Pressable and apply a11yProps
   if (onPress) {
     return (
-      <Pressable {...a11yProps} {...pressableProps}>
+      <Pressable {...a11yProps} {...pressableProps} testID={testId}>
         {generateItem()}
       </Pressable>
     )
diff --git a/VAMobile/src/components/Carousel/CarouselTabBar.tsx b/VAMobile/src/components/Carousel/CarouselTabBar.tsx
index 144eaf5452e..b99c04e2519 100644
--- a/VAMobile/src/components/Carousel/CarouselTabBar.tsx
+++ b/VAMobile/src/components/Carousel/CarouselTabBar.tsx
@@ -9,7 +9,7 @@ import { TFunction } from 'i18next'
 import styled from 'styled-components'
 import _ from 'underscore'
 
-import { a11yHintProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp } from 'utils/accessibility'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
 import { themeFn } from 'utils/theme'
 
@@ -97,8 +97,9 @@ function CarouselTabBar({ onCarouselEnd, screenList, translation }: CarouselTabB
     return (
       <StyledPressable
         onPress={onPressCallback}
+        accessibilityLabel={translation(buttonText)}
+        testID={translation(buttonText)}
         accessibilityRole="link"
-        {...testIdProps(translation(buttonText))}
         {...a11yHintProp(allyHint || '')}>
         <TextView variant="MobileBody" color="primaryContrast" allowFontScaling={false} mr="auto" selectable={false}>
           {translation(buttonText)}
@@ -122,8 +123,9 @@ function CarouselTabBar({ onCarouselEnd, screenList, translation }: CarouselTabB
     return (
       <StyledPressable
         onPress={onContinue}
+        accessibilityLabel={translation(buttonText)}
+        testID={translation(buttonText)}
         accessibilityRole="link"
-        {...testIdProps(translation(buttonText))}
         {...a11yHintProp(allyHint || '')}>
         <TextView
           variant="MobileBodyBold"
@@ -161,7 +163,7 @@ function CarouselTabBar({ onCarouselEnd, screenList, translation }: CarouselTabB
           {goBackOrSkipBtn()}
         </Box>
         <Box
-          {...testIdProps(translation('carouselIndicators'))}
+          testID={'carouselIndicators'}
           {...a11yHintProp(a11yHints?.carouselIndicatorsHint || '')}
           {...progressBarContainerProps}>
           {getProgressBar()}
diff --git a/VAMobile/src/components/CollapsibleView.tsx b/VAMobile/src/components/CollapsibleView.tsx
index 459422c09ff..d766c3564e7 100644
--- a/VAMobile/src/components/CollapsibleView.tsx
+++ b/VAMobile/src/components/CollapsibleView.tsx
@@ -1,7 +1,7 @@
 import React, { FC, useState } from 'react'
 import { Pressable, PressableProps, ViewStyle } from 'react-native'
 
-import { a11yHintProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 import Box, { BoxProps } from './Box'
@@ -84,7 +84,7 @@ const CollapsibleView: FC<CollapsibleViewProps> = ({
   const touchableRow = (
     <Box minHeight={theme.dimensions.touchableMinHeight}>
       <Pressable
-        {...testIdProps(text)}
+        accessibilityLabel={text}
         {...a11yHintProp(a11yHint || '')}
         style={pressableStyles}
         {...pressableProps}
diff --git a/VAMobile/src/components/CommonErrorComponents/BasicError.tsx b/VAMobile/src/components/CommonErrorComponents/BasicError.tsx
index a0744097b65..185a63d9856 100644
--- a/VAMobile/src/components/CommonErrorComponents/BasicError.tsx
+++ b/VAMobile/src/components/CommonErrorComponents/BasicError.tsx
@@ -6,7 +6,6 @@ import { Button } from '@department-of-veterans-affairs/mobile-component-library
 
 import { Box, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 export type BasicErrorProps = {
@@ -54,7 +53,7 @@ const BasicError: FC<BasicErrorProps> = ({
       <Box justifyContent="center" {...containerStyles}>
         {headerText && (
           <TextView
-            {...testIdProps(headerA11yLabel ? headerA11yLabel : headerText)}
+            accessibilityLabel={headerA11yLabel}
             variant="MobileBodyBold"
             accessibilityRole="header"
             textAlign="center">
diff --git a/VAMobile/src/components/FormWrapper/FormFields/VASelector.tsx b/VAMobile/src/components/FormWrapper/FormFields/VASelector.tsx
index aa47d9702ad..fbd2d577036 100644
--- a/VAMobile/src/components/FormWrapper/FormFields/VASelector.tsx
+++ b/VAMobile/src/components/FormWrapper/FormFields/VASelector.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { TouchableWithoutFeedback } from 'react-native'
 
 import { VAIconColors, VATextColors } from 'styles/theme'
-import { a11yHintProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp } from 'utils/accessibility'
 import { getTranslation } from 'utils/formattingUtils'
 import { useTheme } from 'utils/hooks'
 
@@ -96,7 +96,11 @@ const VASelector: FC<VASelectorProps> = ({
   const getCheckBoxIcon = (): React.ReactNode => {
     if (disabled && selectorType === SelectorType.Radio) {
       return (
-        <VAIcon {...getIconsProps('RadioEmpty', 'checkboxDisabled', 'radioDisabled')} {...testIdProps('RadioEmpty')} />
+        <VAIcon
+          {...getIconsProps('RadioEmpty', 'checkboxDisabled', 'radioDisabled')}
+          testID="RadioEmpty"
+          accessibilityLabel="RadioEmpty"
+        />
       )
     }
 
@@ -104,7 +108,8 @@ const VASelector: FC<VASelectorProps> = ({
       return (
         <VAIcon
           {...getIconsProps('CheckBoxError', theme.colors.icon.error, 'checkboxDisabledContrast')}
-          {...testIdProps('CheckBoxError')}
+          testID="CheckBoxError"
+          accessibilityLabel="CheckBoxError"
         />
       )
     }
@@ -116,7 +121,7 @@ const VASelector: FC<VASelectorProps> = ({
     const fill = selected ? 'checkboxEnabledPrimary' : 'checkboxDisabledContrast'
     const stroke = selected ? undefined : 'checkboxDisabled'
 
-    return <VAIcon {...getIconsProps(name, stroke, fill)} {...testIdProps(name)} />
+    return <VAIcon {...getIconsProps(name, stroke, fill)} testID={name} accessibilityLabel={name} />
   }
 
   const hintProp = a11yHint ? a11yHintProp(a11yHint) : {}
@@ -135,7 +140,7 @@ const VASelector: FC<VASelectorProps> = ({
       <Box>
         {!!error && <Box {...errorBoxProps}>{renderInputError(error)}</Box>}
         <Box flexDirection="row">
-          <Box {...testIdProps('checkbox-with-label')} mt={5}>
+          <Box testID="checkbox-with-label" mt={5}>
             {getCheckBoxIcon()}
           </Box>
           <Box {...selectorBoxProps}>
diff --git a/VAMobile/src/components/List.tsx b/VAMobile/src/components/List.tsx
index d56294a68ce..3d9a7846c10 100644
--- a/VAMobile/src/components/List.tsx
+++ b/VAMobile/src/components/List.tsx
@@ -1,6 +1,5 @@
 import React, { FC } from 'react'
 
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 import BaseListItem, { BaseListItemProps } from './BaseListItem'
@@ -72,11 +71,13 @@ const List: FC<ListProps> = ({ items, title, titleA11yLabel }) => {
   return (
     <Box>
       {title && (
-        <Box accessible={true} accessibilityRole={'header'}>
-          <TextView {...titleProps} {...testIdProps(titleA11yLabel ? titleA11yLabel : title)}>
-            {title}
-          </TextView>
-        </Box>
+        <TextView
+          {...titleProps}
+          accessibilityLabel={titleA11yLabel}
+          testID={titleA11yLabel || title}
+          accessible={true}>
+          {title}
+        </TextView>
       )}
       <Box borderTopWidth={theme.dimensions.borderWidth} borderStyle="solid" borderColor="primary">
         <Box backgroundColor={'list'}>{buttons}</Box>
diff --git a/VAMobile/src/components/NavigationTabBar.tsx b/VAMobile/src/components/NavigationTabBar.tsx
index 3ea327a9b77..a6031680d77 100644
--- a/VAMobile/src/components/NavigationTabBar.tsx
+++ b/VAMobile/src/components/NavigationTabBar.tsx
@@ -10,7 +10,7 @@ import { TFunction } from 'i18next'
 import styled from 'styled-components'
 
 import { NAMESPACE } from 'constants/namespaces'
-import { a11yValueProp, testIdProps } from 'utils/accessibility'
+import { a11yValueProp } from 'utils/accessibility'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
 import { changeNavigationBarColor } from 'utils/rnNativeUIUtilities'
 import { themeFn } from 'utils/theme'
@@ -115,7 +115,8 @@ const NavigationTabBar: FC<NavigationTabBarProps> = ({ state, navigation, transl
 
           return (
             <TouchableWithoutFeedback
-              {...testIdProps(translatedName)}
+              accessibilityLabel={translatedName}
+              testID={translatedName}
               {...props}
               {...a11yValueProp({ text: t('listPosition', { position: index + 1, total: state.routes.length }) })}>
               <Box flex={1} display="flex" flexDirection="column" mt={7}>
diff --git a/VAMobile/src/components/Pagination.tsx b/VAMobile/src/components/Pagination.tsx
index 520affbeb48..d7c5f9f98ed 100644
--- a/VAMobile/src/components/Pagination.tsx
+++ b/VAMobile/src/components/Pagination.tsx
@@ -4,7 +4,6 @@ import { Pressable, PressableProps } from 'react-native'
 
 import { Events } from 'constants/analytics'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { useTheme } from 'utils/hooks'
 
@@ -59,7 +58,7 @@ export const PaginationArrow: FC<PaginationArrowProps> = ({ onPress, a11yHint, i
     borderRadius: 5,
   }
   return (
-    <Pressable {...pressableProps} {...testIdProps(testID)}>
+    <Pressable {...pressableProps} testID={testID} accessibilityLabel={testID}>
       <Box {...boxProps}>
         <VAIcon fill={theme.colors.icon.pagination} width={16} height={16} preventScaling={true} {...iconProps} />
       </Box>
diff --git a/VAMobile/src/components/VABulletList.tsx b/VAMobile/src/components/VABulletList.tsx
index a97fbbd0919..3f9f618a4a5 100644
--- a/VAMobile/src/components/VABulletList.tsx
+++ b/VAMobile/src/components/VABulletList.tsx
@@ -3,7 +3,6 @@ import React, { FC } from 'react'
 import _ from 'underscore'
 
 import { VATextColors } from 'styles/theme'
-import { testIdProps } from 'utils/accessibility'
 import { useExternalLink } from 'utils/hooks'
 import { useTheme } from 'utils/hooks'
 
@@ -95,7 +94,7 @@ const VABulletList: FC<VABulletListProps> = ({ listOfText, paragraphSpacing }) =
             <Box mr={20} mt={12}>
               <VAIcon name="Bullet" fill={color || 'bodyText'} height={6} width={6} />
             </Box>
-            <TextView {...textViewProps} {...testIdProps(a11yLabel || text)}>
+            <TextView {...textViewProps} accessibilityLabel={a11yLabel || text}>
               {!!boldedTextPrefix && <TextView variant="MobileBodyBold">{boldedTextPrefix}</TextView>}
               {text.trim()}
               {!!boldedText && <TextView variant="MobileBodyBold">{boldedText}</TextView>}
diff --git a/VAMobile/src/components/VAImage/VAImage.tsx b/VAMobile/src/components/VAImage/VAImage.tsx
index 3565473c9ba..5d112b46a4a 100644
--- a/VAMobile/src/components/VAImage/VAImage.tsx
+++ b/VAMobile/src/components/VAImage/VAImage.tsx
@@ -2,8 +2,6 @@ import React, { FC } from 'react'
 import { Image, useWindowDimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
-import { testIdProps } from 'utils/accessibility'
-
 /**
  * Add images to android('res/drawable') and in xcode('Images.xcassets') when new ones are added.
  * Android and IOS are not rendering using local path(ex. require('./images/asset.png')) and needs to be added as an asset resource.
@@ -53,10 +51,10 @@ const VAImage: FC<VAImageProps> = ({ name, a11yLabel, marginX }) => {
     <Image
       source={imageProps.source}
       style={{ width: width, height: imageProps.height * ratio }}
-      {...testIdProps(a11yLabel)}
       accessibilityLabel={a11yLabel}
       accessible={true}
       accessibilityRole={'image'}
+      testID={a11yLabel}
     />
   )
 }
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/AppealDetailsScreen/AppealIssues/AppealIssues.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/AppealDetailsScreen/AppealIssues/AppealIssues.tsx
index 114800d8d36..f1bba5046fd 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/AppealDetailsScreen/AppealIssues/AppealIssues.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/AppealDetailsScreen/AppealIssues/AppealIssues.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
 
 import { TextArea, TextView, VABulletList } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 
 type AppealsIssuesProps = {
   issues: Array<string>
@@ -13,7 +12,7 @@ function AppealIssues({ issues }: AppealsIssuesProps) {
   const { t } = useTranslation(NAMESPACE.COMMON)
 
   return (
-    <TextArea {...testIdProps('Your-appeal: Issues-tab-appeal-details-page')}>
+    <TextArea>
       <TextView variant="MobileBodyBold" accessibilityRole="header">
         {t('appealDetails.currentlyOnAppeal')}
       </TextView>
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
index 591477e77f0..548854ca3bb 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimFileUpload/TakePhotos/TakePhotos.tsx
@@ -14,7 +14,6 @@ import { MAX_NUM_PHOTOS } from 'constants/claims'
 import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { onAddPhotos } from 'utils/claims'
 import getEnv from 'utils/env'
@@ -97,7 +96,7 @@ function TakePhotos({ navigation, route }: TakePhotosProps) {
           <TextView variant="MobileBody" my={theme.dimensions.standardMarginBetween}>
             {t('fileUpload.takePhotoEachPage')}
           </TextView>
-          <TextView variant="MobileBody" {...testIdProps(t('fileUpload.ifMoreThan10.a11y'))}>
+          <TextView variant="MobileBody" accessibilityLabel={t('fileUpload.ifMoreThan10.a11y')}>
             {t('fileUpload.ifMoreThan10.1')}
             <TextView variant="MobileBodyBold">
               {t('fileUpload.ifMoreThan10.2')}
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimTimeline/DEPRECATED_ClaimPhase.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimTimeline/DEPRECATED_ClaimPhase.tsx
index bcce1f41afb..5e02075fe22 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimTimeline/DEPRECATED_ClaimPhase.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/ClaimTimeline/DEPRECATED_ClaimPhase.tsx
@@ -9,7 +9,6 @@ import { AccordionCollapsible, Box, TextView } from 'components'
 import { Events } from 'constants/analytics'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { groupTimelineActivity, needItemsFromVet, numberOfItemsNeedingAttentionFromVet } from 'utils/claims'
 import { sortByDate } from 'utils/common'
@@ -85,8 +84,10 @@ function DEPRECATED_ClaimPhase({ phase, current, attributes, claimID }: ClaimPha
 
   const getPhaseExpandedContent = (): ReactNode => {
     return (
-      <Box mt={condensedMarginBetween} {...testIdProps(detailsA11yLabel)} accessible={true}>
-        <TextView variant={'MobileBody'}>{detailsText}</TextView>
+      <Box mt={condensedMarginBetween}>
+        <TextView accessibilityLabel={detailsA11yLabel} variant={'MobileBody'}>
+          {detailsText}
+        </TextView>
       </Box>
     )
   }
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/EstimatedDecisionDate/EstimatedDecisionDate.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/EstimatedDecisionDate/EstimatedDecisionDate.tsx
index 8dabac4878c..2e434861dce 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/EstimatedDecisionDate/EstimatedDecisionDate.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimDetailsScreen/ClaimStatus/EstimatedDecisionDate/EstimatedDecisionDate.tsx
@@ -5,7 +5,6 @@ import { DateTime } from 'luxon'
 
 import { AlertWithHaptics, Box, TextArea, TextView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import getEnv from 'utils/env'
 import { formatDateMMMMDDYYYY } from 'utils/formattingUtils'
 import { useExternalLink, useTheme } from 'utils/hooks'
@@ -66,16 +65,14 @@ function EstimatedDecisionDate({ maxEstDate, showCovidMessage }: EstimatedDecisi
 
   return (
     <TextArea>
-      <Box {...testIdProps(`${t('claimDetails.estimatedDecisionDate')} ${displayDate}`)} accessible={true}>
+      <Box accessibilityLabel={`${t('claimDetails.estimatedDecisionDate')} ${displayDate}`} accessible={true}>
         <TextView variant="MobileBody">{t('claimDetails.estimatedDecisionDate')}</TextView>
         <TextView variant="MobileBodyBold">{displayDate}</TextView>
       </Box>
       {!!maxEstDate && !maxEstDateIsMoreThanTwoYearsOut && (
-        <Box {...testIdProps(subText)} accessible={true}>
-          <TextView variant="MobileBody" mt={theme.dimensions.standardMarginBetween}>
-            {subText}
-          </TextView>
-        </Box>
+        <TextView variant="MobileBody" mt={theme.dimensions.standardMarginBetween} accessible={true}>
+          {subText}
+        </TextView>
       )}
     </TextArea>
   )
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/ClaimsAndAppealsListView.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/ClaimsAndAppealsListView.tsx
index 9af14205994..13e1815734d 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/ClaimsAndAppealsListView.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/ClaimsAndAppealsListView.tsx
@@ -18,7 +18,7 @@ import {
 } from 'components'
 import { ClaimType, ClaimTypeConstants } from 'constants/claims'
 import { NAMESPACE } from 'constants/namespaces'
-import { getTestIDFromTextLines, testIdProps } from 'utils/accessibility'
+import { getTestIDFromTextLines } from 'utils/accessibility'
 import { getUserPhase, isDisabilityCompensationClaim } from 'utils/claims'
 import { capitalizeWord, formatDateMMMMDDYYYY } from 'utils/formattingUtils'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
@@ -153,7 +153,7 @@ function ClaimsAndAppealsListView({ claimType, scrollViewRef }: ClaimsAndAppeals
   }
 
   return (
-    <Box {...testIdProps('', false, `${claimType.toLowerCase()}-claims-page`)}>
+    <Box>
       <DefaultList items={getListItemVals()} title={yourClaimsAndAppealsHeader} />
       <Box flex={1} mt={theme.dimensions.paginationTopPadding} mx={theme.dimensions.gutter}>
         <Pagination {...paginationProps} />
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/DEPRECATED_ClaimsAndAppealsListView.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/DEPRECATED_ClaimsAndAppealsListView.tsx
index b36c19e4ffd..9bf797b3db2 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/DEPRECATED_ClaimsAndAppealsListView.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/ClaimsAndAppealsListView/DEPRECATED_ClaimsAndAppealsListView.tsx
@@ -18,7 +18,7 @@ import {
 } from 'components'
 import { ClaimType } from 'constants/claims'
 import { NAMESPACE } from 'constants/namespaces'
-import { getTestIDFromTextLines, testIdProps } from 'utils/accessibility'
+import { getTestIDFromTextLines } from 'utils/accessibility'
 import { capitalizeWord, formatDateMMMMDDYYYY } from 'utils/formattingUtils'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
 import { featureEnabled } from 'utils/remoteConfig'
@@ -146,7 +146,7 @@ function DEPRECATED_ClaimsAndAppealsListView({ claimType, scrollViewRef }: Claim
   }
 
   return (
-    <Box {...testIdProps('', false, `${claimType.toLowerCase()}-claims-page`)}>
+    <Box>
       <DefaultList items={getListItemVals()} title={yourClaimsAndAppealsHeader} />
       <Box flex={1} mt={theme.dimensions.paginationTopPadding} mx={theme.dimensions.gutter}>
         <Pagination {...paginationProps} />
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.tsx
index 75a53c538dd..29730986702 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NeedHelpData/NeedHelpData.tsx
@@ -46,7 +46,11 @@ function NeedHelpData({ isAppeal }: NeedHelpDataProps) {
       <TextView variant="MobileBodyBold" accessibilityRole="header" accessible={true}>
         {t('claimDetails.needHelp')}
       </TextView>
-      <TextView variant="MobileBody" mb={theme.dimensions.standardMarginBetween} accessible={true}>
+      <TextView
+        variant="MobileBody"
+        mb={theme.dimensions.standardMarginBetween}
+        accessible={true}
+        accessibilityLabel={t('claimDetails.callVA.a11yLabel')}>
         {t('claimDetails.callVA')}
       </TextView>
       <ClickToCallPhoneNumber phone={displayedTextPhoneNumber(t('8008271000'))} />
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppeals/NoClaimsAndAppeals.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppeals/NoClaimsAndAppeals.tsx
index b27a71d6d32..36499cc0788 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppeals/NoClaimsAndAppeals.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppeals/NoClaimsAndAppeals.tsx
@@ -6,7 +6,6 @@ import { ClaimsAndAppealsErrorServiceTypesConstants } from 'api/types'
 import { Box, TextView } from 'components'
 import { ClaimType, ClaimTypeConstants } from 'constants/claims'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 type NoClaimsAndAppealsProps = {
@@ -45,22 +44,13 @@ function NoClaimsAndAppeals({ claimType }: NoClaimsAndAppealsProps) {
   }
 
   return (
-    <Box
-      flex={1}
-      justifyContent="center"
-      mx={theme.dimensions.gutter}
-      {...testIdProps('Claims: No-claims-page')}
-      alignItems="center">
-      <Box {...testIdProps(header)} accessible={true}>
-        <TextView variant="MobileBodyBold" textAlign="center" accessibilityRole="header">
-          {header}
-        </TextView>
-      </Box>
-      <Box {...testIdProps(text)} accessible={true}>
-        <TextView variant="MobileBody" textAlign="center" my={theme.dimensions.standardMarginBetween}>
-          {text}
-        </TextView>
-      </Box>
+    <Box flex={1} justifyContent="center" mx={theme.dimensions.gutter} alignItems="center">
+      <TextView variant="MobileBodyBold" textAlign="center" accessibilityRole="header" accessible={true}>
+        {header}
+      </TextView>
+      <TextView variant="MobileBody" textAlign="center" my={theme.dimensions.standardMarginBetween} accessible={true}>
+        {text}
+      </TextView>
     </Box>
   )
 }
diff --git a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppealsAccess/NoClaimsAndAppealsAccess.tsx b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppealsAccess/NoClaimsAndAppealsAccess.tsx
index a075f1bbff2..1ffb075f898 100644
--- a/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppealsAccess/NoClaimsAndAppealsAccess.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/ClaimsScreen/NoClaimsAndAppealsAccess/NoClaimsAndAppealsAccess.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
 import { Box, ClickToCallPhoneNumber, TextArea, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { displayedTextPhoneNumber } from 'utils/formattingUtils'
 import { useTheme } from 'utils/hooks'
 
@@ -13,7 +12,7 @@ function NoClaimsAndAppealsAccess() {
   const { t } = useTranslation(NAMESPACE.COMMON)
 
   return (
-    <VAScrollView {...testIdProps('Claims: No-claims-and-appeals-page')}>
+    <VAScrollView>
       <Box mb={theme.dimensions.contentMarginTop} mx={theme.dimensions.gutter}>
         <TextView variant="MobileBodyBold">{t('claimsAndAppeals.noClaimsAndAppealsAccess.title')}</TextView>
       </Box>
diff --git a/VAMobile/src/screens/BenefitsScreen/DisabilityRatingsScreen/NoDisabilityRatings/NoDisabilityRatings.tsx b/VAMobile/src/screens/BenefitsScreen/DisabilityRatingsScreen/NoDisabilityRatings/NoDisabilityRatings.tsx
index da012393c6d..e8fc0bf4a5d 100644
--- a/VAMobile/src/screens/BenefitsScreen/DisabilityRatingsScreen/NoDisabilityRatings/NoDisabilityRatings.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/DisabilityRatingsScreen/NoDisabilityRatings/NoDisabilityRatings.tsx
@@ -5,7 +5,6 @@ import { StyleProp, ViewStyle } from 'react-native'
 import { Box, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 function NoDisabilityRatings() {
@@ -27,11 +26,7 @@ function NoDisabilityRatings() {
           accessibilityLabel={a11yLabelVA(t('disabilityRating.noDisabilityRatings.title'))}>
           {t('disabilityRating.noDisabilityRatings.title')}
         </TextView>
-        <TextView
-          variant="MobileBody"
-          textAlign="center"
-          my={theme.dimensions.standardMarginBetween}
-          {...testIdProps(bodyText)}>
+        <TextView variant="MobileBody" textAlign="center" my={theme.dimensions.standardMarginBetween}>
           {bodyText}
         </TextView>
       </Box>
diff --git a/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.test.tsx b/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.test.tsx
index a8884d82340..b8439239c94 100644
--- a/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.test.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.test.tsx
@@ -26,7 +26,6 @@ context('GenericLetter', () => {
 
   it('initializes correctly', () => {
     expect(screen.getByText('Review letters')).toBeTruthy()
-    expect(screen.getByTestId('Letters: header-page')).toBeTruthy()
     expect(screen.getByRole('button', { name: 'Review letter' })).toBeTruthy()
   })
 
diff --git a/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.tsx b/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.tsx
index a71a41a1fc5..a1086a52169 100644
--- a/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/Letters/GenericLetter/GenericLetter.tsx
@@ -18,8 +18,6 @@ import {
 } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
-import { testIdProps } from 'utils/accessibility'
-import { generateTestID } from 'utils/common'
 import { useTheme } from 'utils/hooks'
 
 type GenericLetterProps = StackScreenProps<BenefitsStackParamList, 'GenericLetter'>
@@ -67,7 +65,7 @@ function GenericLetter({ navigation, route }: GenericLetterProps) {
           {header}
         </TextView>
         <TextView
-          {...testIdProps(descriptionA11yLabel || description)}
+          accessibilityLabel={descriptionA11yLabel}
           variant="MobileBody"
           mt={theme.dimensions.standardMarginBetween}
           paragraphSpacing={true}>
@@ -86,8 +84,7 @@ function GenericLetter({ navigation, route }: GenericLetterProps) {
     <FeatureLandingTemplate
       backLabel={t('letters.overview.viewLetters')}
       backLabelOnPress={navigation.goBack}
-      title={t('letters.details.title')}
-      {...testIdProps(`Letters: ${generateTestID(header, 'page')}`)}>
+      title={t('letters.details.title')}>
       {downloading ? (
         <LoadingComponent text={t('letters.loading')} />
       ) : letterDownloadError ? (
diff --git a/VAMobile/src/screens/BenefitsScreen/Letters/LettersListScreen.tsx b/VAMobile/src/screens/BenefitsScreen/Letters/LettersListScreen.tsx
index ce64711cffd..58ea6f73026 100644
--- a/VAMobile/src/screens/BenefitsScreen/Letters/LettersListScreen.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/Letters/LettersListScreen.tsx
@@ -21,7 +21,6 @@ import { NAMESPACE } from 'constants/namespaces'
 import { BenefitsStackParamList } from 'screens/BenefitsScreen/BenefitsStackScreens'
 import { DowntimeFeatureTypeConstants, ScreenIDTypesConstants } from 'store/api/types'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { useDowntime, useRouteNavigation, useTheme } from 'utils/hooks'
 import { screenContentAllowed } from 'utils/waygateConfig'
@@ -132,8 +131,7 @@ function LettersListScreen({ navigation }: LettersListScreenProps) {
     <FeatureLandingTemplate
       backLabel={t('letters.overview.title')}
       backLabelOnPress={navigation.goBack}
-      title={t('letters.overview.viewLetters')}
-      {...testIdProps('Letters-list-page')}>
+      title={t('letters.overview.viewLetters')}>
       {!lettersNotInDowntime ? (
         <ErrorComponent screenID={ScreenIDTypesConstants.LETTERS_LIST_SCREEN_ID} />
       ) : loading || loadingUserAuthorizedServices ? (
diff --git a/VAMobile/src/screens/BenefitsScreen/Letters/LettersOverviewScreen.tsx b/VAMobile/src/screens/BenefitsScreen/Letters/LettersOverviewScreen.tsx
index 40077dd24ee..d1b35f47684 100644
--- a/VAMobile/src/screens/BenefitsScreen/Letters/LettersOverviewScreen.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/Letters/LettersOverviewScreen.tsx
@@ -14,7 +14,6 @@ import AddressSummary, {
   addressDataField,
   profileAddressOptions,
 } from 'screens/HomeScreen/ProfileScreen/ContactInformationScreen/AddressSummary'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
 
@@ -41,7 +40,6 @@ function LettersOverviewScreen({ navigation }: LettersOverviewProps) {
       backLabel={t('benefits.title')}
       backLabelOnPress={navigation.goBack}
       title={t('letters.overview.title')}
-      {...testIdProps('Letters-page')}
       testID="lettersPageID">
       {!userAuthorizedServices?.lettersAndDocuments ? (
         <NoLettersScreen />
diff --git a/VAMobile/src/screens/BenefitsScreen/Letters/NoLettersScreen/NoLettersScreen.tsx b/VAMobile/src/screens/BenefitsScreen/Letters/NoLettersScreen/NoLettersScreen.tsx
index e77b1534ad7..7e5bfbdfdbe 100644
--- a/VAMobile/src/screens/BenefitsScreen/Letters/NoLettersScreen/NoLettersScreen.tsx
+++ b/VAMobile/src/screens/BenefitsScreen/Letters/NoLettersScreen/NoLettersScreen.tsx
@@ -5,7 +5,6 @@ import { ViewStyle } from 'react-native'
 import { Box, ClickToCallPhoneNumber, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { displayedTextPhoneNumber } from 'utils/formattingUtils'
 import { useTheme } from 'utils/hooks'
 
@@ -19,7 +18,7 @@ function NoLettersScreen() {
   }
 
   return (
-    <VAScrollView contentContainerStyle={scrollStyles} {...testIdProps('Letters: No-letters-page')}>
+    <VAScrollView contentContainerStyle={scrollStyles}>
       <Box justifyContent="center" mx={theme.dimensions.gutter} alignItems="center">
         <TextView
           variant="MobileBodyBold"
diff --git a/VAMobile/src/screens/BiometricsPreferenceScreen/BiometricsPreferenceScreen.tsx b/VAMobile/src/screens/BiometricsPreferenceScreen/BiometricsPreferenceScreen.tsx
index b0aeb2eeff6..955a062d5b7 100644
--- a/VAMobile/src/screens/BiometricsPreferenceScreen/BiometricsPreferenceScreen.tsx
+++ b/VAMobile/src/screens/BiometricsPreferenceScreen/BiometricsPreferenceScreen.tsx
@@ -8,7 +8,6 @@ import { Box, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { RootState } from 'store'
 import { AuthState, setBiometricsPreference, setDisplayBiometricsPreferenceScreen } from 'store/slices'
-import { testIdProps } from 'utils/accessibility'
 import {
   getSupportedBiometricA11yLabel,
   getSupportedBiometricText,
@@ -42,12 +41,12 @@ function BiometricsPreferenceScreen({}: SyncScreenProps) {
   }
 
   return (
-    <VAScrollView {...testIdProps('Biometrics-preference-page')}>
+    <VAScrollView>
       <Box mt={60} mb={theme.dimensions.contentMarginBottom} mx={theme.dimensions.gutter}>
         <TextView
           variant="BitterHeading"
           accessibilityRole="header"
-          {...testIdProps(t('biometricsPreference.doYouWantToAllow.a11yLabel', { biometricsA11yLabel }))}>
+          accessibilityLabel={t('biometricsPreference.doYouWantToAllow.a11yLabel', { biometricsA11yLabel })}>
           {t('biometricsPreference.doYouWantToAllow', { biometricsText })}
         </TextView>
         <TextView paragraphSpacing={true} variant="MobileBody" mt={theme.dimensions.textAndButtonLargeMargin}>
diff --git a/VAMobile/src/screens/HealthScreen/Appointments/NoAppointments/NoAppointments.tsx b/VAMobile/src/screens/HealthScreen/Appointments/NoAppointments/NoAppointments.tsx
index b8360c93095..26506a5c738 100644
--- a/VAMobile/src/screens/HealthScreen/Appointments/NoAppointments/NoAppointments.tsx
+++ b/VAMobile/src/screens/HealthScreen/Appointments/NoAppointments/NoAppointments.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
 import { Box, LinkWithAnalytics, TextView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import getEnv from 'utils/env'
 import { useTheme } from 'utils/hooks'
 
@@ -25,19 +24,19 @@ export function NoAppointments({ subText, subTextA11yLabel, showVAGovLink = true
       flex={1}
       justifyContent="center"
       mx={theme.dimensions.gutter}
-      {...testIdProps('Appointments: No-appointments-page')}
       alignItems="center"
       mt={theme.dimensions.textAndButtonLargeMargin}>
-      <Box {...testIdProps(t('noAppointments.youDontHave'))} accessibilityRole="header" accessible={true}>
-        <TextView variant="MobileBodyBold" textAlign="center">
-          {t('noAppointments.youDontHave')}
-        </TextView>
-      </Box>
-      <Box {...testIdProps(subTextA11yLabel || subText)} accessible={true}>
-        <TextView variant="MobileBody" textAlign="center" my={theme.dimensions.standardMarginBetween}>
-          {subText}
-        </TextView>
-      </Box>
+      <TextView variant="MobileBodyBold" textAlign="center" accessibilityRole="header" accessible={true}>
+        {t('noAppointments.youDontHave')}
+      </TextView>
+      <TextView
+        variant="MobileBody"
+        textAlign="center"
+        my={theme.dimensions.standardMarginBetween}
+        accessible={true}
+        accessibilityLabel={subTextA11yLabel}>
+        {subText}
+      </TextView>
       {showVAGovLink && (
         <LinkWithAnalytics
           type="url"
diff --git a/VAMobile/src/screens/HealthScreen/Appointments/NoMatchInRecords/NoMatchInRecords.tsx b/VAMobile/src/screens/HealthScreen/Appointments/NoMatchInRecords/NoMatchInRecords.tsx
index 1ebe6a2e1ce..c56214e4745 100644
--- a/VAMobile/src/screens/HealthScreen/Appointments/NoMatchInRecords/NoMatchInRecords.tsx
+++ b/VAMobile/src/screens/HealthScreen/Appointments/NoMatchInRecords/NoMatchInRecords.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
 import { AccordionCollapsible, Box, ClickToCallPhoneNumber, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { getTranslation } from 'utils/formattingUtils'
 import { useTheme } from 'utils/hooks'
 
@@ -32,7 +31,7 @@ function NoMatchInRecords() {
   }
 
   return (
-    <VAScrollView {...testIdProps('Health care: No match in records')}>
+    <VAScrollView>
       <Box mb={theme.dimensions.contentMarginBottom}>
         <Box mx={theme.dimensions.gutter}>
           <TextView
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/Folders/Folders.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/Folders/Folders.tsx
index 4601b85389d..00822ca8366 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/Folders/Folders.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/Folders/Folders.tsx
@@ -11,7 +11,6 @@ import { Events } from 'constants/analytics'
 import { NAMESPACE } from 'constants/namespaces'
 import { FolderNameTypeConstants, HIDDEN_FOLDERS, TRASH_FOLDER_NAME } from 'constants/secureMessaging'
 import { VATheme } from 'styles/theme'
-import { testIdProps } from 'utils/accessibility'
 import { logAnalyticsEvent } from 'utils/analytics'
 import { useRouteNavigation, useTheme } from 'utils/hooks'
 
@@ -126,7 +125,7 @@ function Folders({}: FoldersProps) {
   }
 
   return (
-    <VAScrollView {...testIdProps('', false, 'Folders-page')}>
+    <VAScrollView>
       <Box>
         {getSystemFolders(foldersData?.data || [], theme, t, onFolderPress)}
         {getUserFolders(foldersData?.data || [], theme, t, onFolderPress)}
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/NoInboxMessages/NoInboxMessages.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/NoInboxMessages/NoInboxMessages.tsx
index 2dd3d587b68..e5f72d10f5e 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/NoInboxMessages/NoInboxMessages.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/NoInboxMessages/NoInboxMessages.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
 
 import { Box, TextView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 function NoInboxMessages() {
@@ -12,7 +11,6 @@ function NoInboxMessages() {
 
   return (
     <Box
-      {...testIdProps('Messages: No-messages-page')}
       flex={1}
       justifyContent="center"
       mx={theme.dimensions.gutter}
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/NotEnrolledSM/NotEnrolledSM.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/NotEnrolledSM/NotEnrolledSM.tsx
index bcba5d940b2..9b3d8e56ccd 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/NotEnrolledSM/NotEnrolledSM.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/NotEnrolledSM/NotEnrolledSM.tsx
@@ -6,7 +6,6 @@ import { LinkProps } from '@department-of-veterans-affairs/mobile-component-libr
 import { Box, LinkWithAnalytics, TextArea, TextView, VABulletList, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import getEnv from 'utils/env'
 import { useTheme } from 'utils/hooks'
 
@@ -43,14 +42,14 @@ function NotEnrolledSM() {
   return (
     <VAScrollView>
       <Box mb={contentMarginBottom}>
-        <Box
-          {...testIdProps(t('notEnrolledSM.title'))}
+        <TextView
+          variant="MobileBodyBold"
           accessibilityRole="header"
           accessible={true}
           mx={theme.dimensions.gutter}
           mb={standardMarginBetween}>
-          <TextView variant="MobileBodyBold">{t('notEnrolledSM.title')}</TextView>
-        </Box>
+          {t('notEnrolledSM.title')}
+        </TextView>
         <Box>
           <TextArea>
             <TextView variant="MobileBody" paragraphSpacing={true}>
diff --git a/VAMobile/src/screens/HealthScreen/SecureMessaging/TermsAndConditions/TermsAndConditions.tsx b/VAMobile/src/screens/HealthScreen/SecureMessaging/TermsAndConditions/TermsAndConditions.tsx
index 144b27cabf3..1cb1940494c 100644
--- a/VAMobile/src/screens/HealthScreen/SecureMessaging/TermsAndConditions/TermsAndConditions.tsx
+++ b/VAMobile/src/screens/HealthScreen/SecureMessaging/TermsAndConditions/TermsAndConditions.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
 
 import { Box, LinkWithAnalytics, TextArea, TextView, VAScrollView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import getEnv from 'utils/env'
 import { useTheme } from 'utils/hooks'
 
@@ -16,19 +15,19 @@ function TermsAndConditions() {
   return (
     <VAScrollView>
       <Box mb={contentMarginBottom}>
-        <Box
-          {...testIdProps(t('termsAndConditions.title'))}
+        <TextView
+          variant="MobileBodyBold"
           accessibilityRole="header"
           accessible={true}
           mx={gutter}
           mb={standardMarginBetween}>
-          <TextView variant="MobileBodyBold">{t('termsAndConditions.title')}</TextView>
-        </Box>
+          {t('termsAndConditions.title')}
+        </TextView>
         <TextArea>
           <TextView
             variant="MobileBody"
             paragraphSpacing={true}
-            {...testIdProps(t('termsAndConditions.toAccept.a11yLabel'))}>
+            accessibilityLabel={t('termsAndConditions.toAccept.a11yLabel')}>
             {t('termsAndConditions.toAccept')}
           </TextView>
           <Box mb={theme.paragraphSpacing.spacing20FontSize}>
diff --git a/VAMobile/src/screens/HomeScreen/ProfileScreen/MilitaryInformationScreen/NoMilitaryInformationAccess.tsx b/VAMobile/src/screens/HomeScreen/ProfileScreen/MilitaryInformationScreen/NoMilitaryInformationAccess.tsx
index a8c56fff5d2..231ea454dff 100644
--- a/VAMobile/src/screens/HomeScreen/ProfileScreen/MilitaryInformationScreen/NoMilitaryInformationAccess.tsx
+++ b/VAMobile/src/screens/HomeScreen/ProfileScreen/MilitaryInformationScreen/NoMilitaryInformationAccess.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
 
 import { Box, TextView } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 function NoMilitaryInformationAccess() {
@@ -19,7 +18,7 @@ function NoMilitaryInformationAccess() {
         variant="MobileBody"
         textAlign="center"
         my={theme.dimensions.standardMarginBetween}
-        {...testIdProps(t('militaryInformation.noMilitaryInfoAccess.body.a11yLabel'))}
+        accessibilityLabel={t('militaryInformation.noMilitaryInfoAccess.body.a11yLabel')}
         testID="noMilitaryAccessTestID">
         {t('militaryInformation.noMilitaryInfoAccess.body')}
       </TextView>
diff --git a/VAMobile/src/screens/OnboardingCarousel/GenericOnboarding/GenericOnboarding.tsx b/VAMobile/src/screens/OnboardingCarousel/GenericOnboarding/GenericOnboarding.tsx
index 8749f5658df..5e60926fe88 100644
--- a/VAMobile/src/screens/OnboardingCarousel/GenericOnboarding/GenericOnboarding.tsx
+++ b/VAMobile/src/screens/OnboardingCarousel/GenericOnboarding/GenericOnboarding.tsx
@@ -4,7 +4,6 @@ import { View, ViewStyle } from 'react-native'
 import { useFocusEffect } from '@react-navigation/native'
 
 import { Box, TextView, TextViewProps, VABulletList, VABulletListText, VAIcon, VAScrollView } from 'components'
-import { testIdProps } from 'utils/accessibility'
 import { useAccessibilityFocus, useOrientation, useTheme } from 'utils/hooks'
 
 export type GenericOnboardingProps = {
@@ -62,7 +61,7 @@ function GenericOnboarding({
         </Box>
         {text && (
           <TextView
-            {...testIdProps(textA11yLabel || text)}
+            accessibilityLabel={textA11yLabel}
             variant="MobileBody"
             color="primaryContrast"
             mt={theme.dimensions.standardMarginBetween}>
diff --git a/VAMobile/src/screens/SplashScreen/SplashScreen.tsx b/VAMobile/src/screens/SplashScreen/SplashScreen.tsx
index e11ca23a6c2..1fec9bd2591 100644
--- a/VAMobile/src/screens/SplashScreen/SplashScreen.tsx
+++ b/VAMobile/src/screens/SplashScreen/SplashScreen.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { StatusBar, ViewStyle } from 'react-native'
 
 import { Box, VALogo, VAScrollView } from 'components'
-import { testIdProps } from 'utils/accessibility'
 import { useOrientation, useTheme } from 'utils/hooks'
 
 export type SplashScreenProps = Record<string, unknown>
@@ -16,7 +15,7 @@ function SplashScreen({}: SplashScreenProps) {
   const isPortrait = useOrientation()
 
   return (
-    <VAScrollView {...testIdProps('Splash-page')} contentContainerStyle={splashStyles} removeInsets={true}>
+    <VAScrollView testID="Splash-page" contentContainerStyle={splashStyles} removeInsets={true}>
       <StatusBar
         translucent
         barStyle={theme.mode === 'dark' ? 'light-content' : 'dark-content'}
diff --git a/VAMobile/src/screens/SyncScreen/SyncScreen.tsx b/VAMobile/src/screens/SyncScreen/SyncScreen.tsx
index e093f7b3d5d..b121a8c2e63 100644
--- a/VAMobile/src/screens/SyncScreen/SyncScreen.tsx
+++ b/VAMobile/src/screens/SyncScreen/SyncScreen.tsx
@@ -20,7 +20,6 @@ import { RootState } from 'store'
 import { AuthState, ErrorsState, checkForDowntimeErrors, completeSync, logInDemoMode } from 'store/slices'
 import { DemoState } from 'store/slices/demoSlice'
 import colors from 'styles/themes/VAColors'
-import { testIdProps } from 'utils/accessibility'
 import { setAnalyticsUserProperty } from 'utils/analytics'
 import { getUpcomingAppointmentDateRange } from 'utils/appointments'
 import getEnv from 'utils/env'
@@ -95,7 +94,7 @@ function SyncScreen({}: SyncScreenProps) {
   }, [dispatch, loggedIn, loggingOut, downtimeWindowsFetched, authorizedServicesFetched, t, syncing, ENVIRONMENT])
 
   return (
-    <VAScrollView {...testIdProps('Sync-page')} contentContainerStyle={splashStyles} removeInsets={true}>
+    <VAScrollView contentContainerStyle={splashStyles} removeInsets={true}>
       <StatusBar
         translucent
         barStyle={theme.mode === 'dark' ? 'light-content' : 'dark-content'}
diff --git a/VAMobile/src/screens/WebviewScreen/WebviewControlButton.tsx b/VAMobile/src/screens/WebviewScreen/WebviewControlButton.tsx
index c73391f9750..e4addf01252 100644
--- a/VAMobile/src/screens/WebviewScreen/WebviewControlButton.tsx
+++ b/VAMobile/src/screens/WebviewScreen/WebviewControlButton.tsx
@@ -4,7 +4,7 @@ import { StyleProp, TouchableOpacity, TouchableOpacityProps, ViewStyle } from 'r
 import { Box, BoxProps, VA_ICON_MAP } from 'components'
 import { VAIcon } from 'components'
 import { VAIconColors } from 'styles/theme'
-import { a11yHintProp, testIdProps } from 'utils/accessibility'
+import { a11yHintProp } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 
 /**
@@ -26,12 +26,24 @@ type ControlButtonProps = {
   testID?: string
   /** optional accessibility hint for the button */
   a11yHint?: string
+  /** optional accessibility label for the button */
+  a11yLabel?: string
 }
 
 /**
  * Button used on the Webview screen to interact with webview controls such as forward, back, open or refresh
  */
-function WebviewControlButton({ icon, onPress, disabled, width, height, fill, testID, a11yHint }: ControlButtonProps) {
+function WebviewControlButton({
+  icon,
+  onPress,
+  disabled,
+  width,
+  height,
+  fill,
+  testID,
+  a11yHint,
+  a11yLabel,
+}: ControlButtonProps) {
   const theme = useTheme()
 
   fill = fill || theme.colors.icon.active
@@ -54,7 +66,11 @@ function WebviewControlButton({ icon, onPress, disabled, width, height, fill, te
   }
 
   return (
-    <TouchableOpacity {...touchableOpacityProps} {...testIdProps(testID || '')} {...a11yHintProp(a11yHint || '')}>
+    <TouchableOpacity
+      {...touchableOpacityProps}
+      accessibilityLabel={a11yLabel}
+      testID={testID}
+      {...a11yHintProp(a11yHint || '')}>
       <Box {...controlBoxProps} style={disabled ? disabledButtonStyle : null}>
         <VAIcon name={icon} width={width} height={height} fill={fill} preventScaling={true} />
       </Box>
diff --git a/VAMobile/src/screens/WebviewScreen/WebviewControls.tsx b/VAMobile/src/screens/WebviewScreen/WebviewControls.tsx
index 57aa6daaefb..40334672b73 100644
--- a/VAMobile/src/screens/WebviewScreen/WebviewControls.tsx
+++ b/VAMobile/src/screens/WebviewScreen/WebviewControls.tsx
@@ -6,7 +6,6 @@ import styled from 'styled-components'
 
 import { Box, BoxProps } from 'components'
 import { NAMESPACE } from 'constants/namespaces'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 import { themeFn } from 'utils/theme'
 
@@ -56,20 +55,23 @@ function WebviewControls(props: WebviewControlsProps) {
           onPress={props.onBackPressed}
           disabled={!props.canGoBack}
           a11yHint={t('back.a11yHint')}
-          {...testIdProps(t('back'))}
+          a11yLabel={t('back')}
+          testID={t('back')}
         />
         <WebviewControlButton
           icon={'ChevronRight'}
           onPress={props.onForwardPressed}
           disabled={!props.canGoForward}
           a11yHint={t('forward.a11yHint')}
-          {...testIdProps(t('forward'))}
+          a11yLabel={t('forward')}
+          testID={t('forward')}
         />
         <WebviewControlButton
           icon={'ExternalLink'}
           onPress={props.onOpenPressed}
           a11yHint={t('openInBrowser.a11yHint')}
-          {...testIdProps(t('openInBrowser'))}
+          a11yLabel={t('openInBrowser')}
+          testID={t('openInBrowser')}
         />
       </Box>
     </StyledSafeAreaView>
diff --git a/VAMobile/src/screens/WebviewScreen/WebviewScreen.tsx b/VAMobile/src/screens/WebviewScreen/WebviewScreen.tsx
index bb1037b39bc..51f2cc1e06b 100644
--- a/VAMobile/src/screens/WebviewScreen/WebviewScreen.tsx
+++ b/VAMobile/src/screens/WebviewScreen/WebviewScreen.tsx
@@ -10,7 +10,6 @@ import { BackButton } from 'components/BackButton'
 import { BackButtonLabelConstants } from 'constants/backButtonLabels'
 import { NAMESPACE } from 'constants/namespaces'
 import { a11yLabelVA } from 'utils/a11yLabel'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 import { isIOS } from 'utils/platform'
 
@@ -43,6 +42,7 @@ function ReloadButton({ reloadPressed }: ReloadButtonProps) {
         icon={'Redo'}
         fill={colors.icon.webviewReload}
         testID={t('refresh')}
+        a11yLabel={t('refresh')}
       />
     </Box>
   )
@@ -157,7 +157,7 @@ function WebviewScreen({ navigation, route }: WebviewScreenProps) {
   }
 
   return (
-    <Box {...mainViewBoxProps} {...testIdProps('Webview-page', true)}>
+    <Box {...mainViewBoxProps} testID="Webview-page">
       <StatusBar
         translucent
         barStyle={theme.mode === 'dark' ? 'light-content' : 'dark-content'}
@@ -178,7 +178,7 @@ function WebviewScreen({ navigation, route }: WebviewScreenProps) {
           setCanGoForward(navState.canGoForward)
           setCurrentUrl(navState.url)
         }}
-        {...testIdProps('Webview-web', true)}
+        testID="Webview-web"
       />
       <WebviewControls {...controlProps} />
     </Box>
diff --git a/VAMobile/src/screens/WebviewScreen/WebviewTitle.tsx b/VAMobile/src/screens/WebviewScreen/WebviewTitle.tsx
index b49d4a468fe..3059fd37d2e 100644
--- a/VAMobile/src/screens/WebviewScreen/WebviewTitle.tsx
+++ b/VAMobile/src/screens/WebviewScreen/WebviewTitle.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 
 import { Box, BoxProps, TextView, VAIcon } from 'components'
-import { testIdProps } from 'utils/accessibility'
 import { useTheme } from 'utils/hooks'
 import { isIOS } from 'utils/platform'
 
@@ -21,7 +20,7 @@ function WebviewTitle({ title }: WebviewTitleProps) {
   }
 
   return (
-    <Box {...testIdProps(title)} {...titleBoxProps}>
+    <Box accessibilityLabel={title} {...titleBoxProps}>
       <Box mr={theme.dimensions.textIconMargin}>
         <VAIcon name={'Lock'} height={20} width={17} fill={theme.colors.text.webviewTitle} preventScaling={true} />
       </Box>
diff --git a/VAMobile/src/screens/auth/LoginScreen/LoginScreen.tsx b/VAMobile/src/screens/auth/LoginScreen/LoginScreen.tsx
index 8616860e8a3..04278ff1252 100644
--- a/VAMobile/src/screens/auth/LoginScreen/LoginScreen.tsx
+++ b/VAMobile/src/screens/auth/LoginScreen/LoginScreen.tsx
@@ -15,7 +15,7 @@ import { RootState } from 'store'
 import { AuthParamsLoadingStateTypeConstants } from 'store/api/types/auth'
 import { AuthState, FIRST_TIME_LOGIN, NEW_SESSION, loginStart, setPKCEParams } from 'store/slices/authSlice'
 import { DemoState, updateDemoMode } from 'store/slices/demoSlice'
-import { testIdProps } from 'utils/accessibility'
+import { a11yLabelVA } from 'utils/a11yLabel'
 import { logAnalyticsEvent } from 'utils/analytics'
 import getEnv from 'utils/env'
 import { useAppDispatch, useOrientation, useRouteNavigation, useTheme } from 'utils/hooks'
@@ -98,7 +98,7 @@ function LoginScreen() {
         }
 
   return (
-    <VAScrollView {...testIdProps('Login-page', true)} contentContainerStyle={mainViewStyle} removeInsets={true}>
+    <VAScrollView testID="Login-page" contentContainerStyle={mainViewStyle} removeInsets={true}>
       <StatusBar
         translucent
         barStyle={theme.mode === 'dark' ? 'light-content' : 'dark-content'}
@@ -129,7 +129,12 @@ function LoginScreen() {
           <Button onPress={onLoginInit} label={t('signin')} />
         </Box>
         <Box mx={theme.dimensions.gutter} mb={70}>
-          <Button onPress={onFacilityLocator} label={t('findLocation.title')} buttonType={ButtonVariants.Secondary} />
+          <Button
+            onPress={onFacilityLocator}
+            label={t('findLocation.title')}
+            a11yLabel={a11yLabelVA(t('findLocation.title'))}
+            buttonType={ButtonVariants.Secondary}
+          />
         </Box>
         <AppVersionAndBuild textColor={'appVersionAndBuild'} />
       </Box>
diff --git a/VAMobile/src/utils/accessibility.tsx b/VAMobile/src/utils/accessibility.tsx
index c2d70d267b3..ce34512b500 100644
--- a/VAMobile/src/utils/accessibility.tsx
+++ b/VAMobile/src/utils/accessibility.tsx
@@ -13,29 +13,6 @@ const { RNCheckVoiceOver } = NativeModules
 
 const { IS_TEST } = getEnv()
 
-interface AccessabilityProps {
-  accessible?: boolean
-  testID?: string
-  accessibilityLabel?: string
-}
-export const testIdProps = (
-  id: string,
-  disableAccessible?: boolean,
-  integrationTestOnlyTestId?: string,
-): AccessabilityProps => {
-  const disableAccessibility = disableAccessible ? { accessible: false } : { accessible: undefined }
-
-  const idToUse = IS_TEST && integrationTestOnlyTestId ? integrationTestOnlyTestId : id
-
-  // setting both testID and  accessibilityLabel prevents elements from being found in the integration tests on iOS
-  // testID is not used on android for the integration tests
-  if (IS_TEST) {
-    return { ...disableAccessibility, testID: idToUse }
-  }
-
-  return { ...disableAccessibility, testID: idToUse, accessibilityLabel: idToUse }
-}
-
 export const a11yHintProp = (hint: string): { accessibilityHint?: string } => {
   // Remove a11yHints from tests as it can cause querying issues for android integration tests
   return IS_TEST ? {} : { accessibilityHint: hint }