diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
index 71d64e696..dd29a0da6 100644
--- a/app/containers/Button/index.tsx
+++ b/app/containers/Button/index.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import { StyleSheet, Text } from 'react-native';
+import { ButtonProps, StyleSheet, Text } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
 import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 import ActivityIndicator from '../ActivityIndicator';
 
-interface IButtonProps {
+interface IButtonProps extends ButtonProps {
 	title: string;
 	type: string;
 	onPress(): void;
diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx
index fd7961762..ddb7e6772 100644
--- a/app/views/NewServerView/ServerInput/index.tsx
+++ b/app/views/NewServerView/ServerInput/index.tsx
@@ -64,6 +64,7 @@ const ServerInput = ({
 				theme={theme}
 				onFocus={() => setFocused(true)}
 				onBlur={() => setFocused(false)}
+				accessibilityLabel='enter-workspace-url'
 			/>
 			{focused && serversHistory?.length ? (
 				<View
diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx
index 20da385f2..7cb68590b 100644
--- a/app/views/NewServerView/index.tsx
+++ b/app/views/NewServerView/index.tsx
@@ -376,6 +376,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 						style={[styles.connectButton, { marginTop: verticalScale({ size: 16, height }) }]}
 						theme={theme}
 						testID='new-server-view-button'
+						accessibilityLabel='new-server-view-button'
 					/>
 					<OrSeparator theme={theme} />
 					<Text