diff --git a/app/client/src/pages/Applications/CreateApplicationForm.tsx b/app/client/src/pages/Applications/CreateApplicationForm.tsx
index 31e981a03e..d8696bf1d6 100644
--- a/app/client/src/pages/Applications/CreateApplicationForm.tsx
+++ b/app/client/src/pages/Applications/CreateApplicationForm.tsx
@@ -37,6 +37,7 @@ export const CreateApplicationForm = (props: Props) => {
         onSubmit={handleSubmit(createApplicationFormSubmitHandler)}
         divider
         submitOnEnter
+        data-cy = "t--create-app-submit"
         submitText="Submit"
         size="small"
         submitting={submitting && !error}
diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx
index 8d59ba08c0..db0e19ff38 100644
--- a/app/client/src/pages/Applications/index.tsx
+++ b/app/client/src/pages/Applications/index.tsx
@@ -57,6 +57,8 @@ const ApplicationCardsWrapper = styled.div`
   font-size: ${props => props.theme.fontSizes[4]}px;
 `;
 
+const OrgSection = styled.div``
+ 
 const OrgName = styled.div`
   display: flex;
   font-size: ${props => props.theme.fontSizes[3]}px;
@@ -215,7 +217,7 @@ class Applications extends Component<
             const { organization, applications } = organizationObject;
 
             return (
-              <>
+              <OrgSection className="t--org-section">
                 {!isPermitted(
                   organization.userPermissions,
                   PERMISSION_TYPE.MANAGE_ORGANIZATION,
@@ -258,7 +260,7 @@ class Applications extends Component<
                     </StyledDialog>
                     <FormDialogComponent
                       trigger={
-                        <Button text="Share" intent={"primary"} filled />
+                        <Button text="Share" intent={"primary"} className="t--org-share-btn" filled />
                       }
                       Form={InviteUsersFormv2}
                       orgId={organization.id}
@@ -276,7 +278,7 @@ class Applications extends Component<
                         <Icon
                           icon="plus"
                           iconSize={70}
-                          className="createIcon"
+                          className="t--create-app-popup"
                         />
                         <div className="createnew">Create New</div>
                       </ApplicationAddCardWrapper>
@@ -298,7 +300,7 @@ class Applications extends Component<
                   })}
                   <PageSectionDivider />
                 </ApplicationCardsWrapper>
-              </>
+              </OrgSection>
             );
           })}
       </PageWrapper>
diff --git a/app/client/src/pages/organization/CreateOrganizationForm.tsx b/app/client/src/pages/organization/CreateOrganizationForm.tsx
index e1ae6fb531..d27a4098ce 100644
--- a/app/client/src/pages/organization/CreateOrganizationForm.tsx
+++ b/app/client/src/pages/organization/CreateOrganizationForm.tsx
@@ -29,6 +29,7 @@ export const CreateApplicationForm = (
       <FormFooter
         onCancel={props.onCancel}
         divider
+        data-cy="t--create-org-submit"
         submitOnEnter
         submitText="Submit"
         onSubmit={handleSubmit(createOrganizationSubmitHandler)}
diff --git a/app/client/src/pages/organization/InviteUsersFromv2.tsx b/app/client/src/pages/organization/InviteUsersFromv2.tsx
index c181ebda72..99b54d85e0 100644
--- a/app/client/src/pages/organization/InviteUsersFromv2.tsx
+++ b/app/client/src/pages/organization/InviteUsersFromv2.tsx
@@ -155,6 +155,7 @@ const InviteUsersForm = (props: any) => {
             type="email"
             label="Emails"
             intent="success"
+            data-cy= "t--invite-email-input"
           />
           <SelectField
             name="role"
@@ -162,10 +163,11 @@ const InviteUsersForm = (props: any) => {
             options={props.roles}
             size="large"
             outline={false}
+            data-cy= "t--invite-role-input"
           />
         </div>
         <StyledButton
-          className="invite"
+          className="t--invite-user-btn"
           disabled={!valid}
           text="Invite"
           filled