diff --git a/__fixtures__/recipients.js b/__fixtures__/recipients.js
new file mode 100644
index 00000000000..9513f86d28f
--- /dev/null
+++ b/__fixtures__/recipients.js
@@ -0,0 +1,3 @@
+export default {
+  users: [{ label: 'bob', value: { shareType: 0, shareWith: 'bob', userType: 0 } }]
+}
diff --git a/__mocks__/sdk.js b/__mocks__/sdk.js
index 04ca97bb4a1..7338e0b756f 100644
--- a/__mocks__/sdk.js
+++ b/__mocks__/sdk.js
@@ -6,6 +6,7 @@ import fixtureSharedViaLinksFiles from '../__fixtures__/sharedViaLinkFiles'
 import fixtureSharedWithMeFiles from '../__fixtures__/sharedWithMeFiles'
 import fixtureDeletedFiles from '../__fixtures__/deletedFiles'
 import fixturePublicFiles from '../__fixtures__/publicFiles'
+import fixtureRecipients from '../__fixtures__/recipients'
 
 export default {
   files: {
@@ -41,6 +42,64 @@ export default {
     list: path => fixturePublicFiles[path]
   },
   shares: {
-    getShares: () => new Promise(resolve => resolve())
+    getShares: () => Promise.resolve(),
+    getRecipients,
+    shareFileWithUser: (path, id, params) =>
+      Promise.resolve({
+        shareInfo: {
+          id: 1,
+          share_type: 0,
+          uid_owner: 'alice', // TODO: get user dynamically
+          displayname_owner: 'alice', // TODO: get user dynamically
+          permissions: params.permissions,
+          stime: new Date().getTime(),
+          expiration: params.expirationDate,
+          uid_file_owner: 'alice', // TODO: get user dynamically
+          displayname_file_owner: 'alice', // TODO: get user dynamically
+          path,
+          item_type: 'folder', // TODO: get item type dynamically
+          item_source: 10,
+          file_source: 10,
+          file_parent: 6,
+          file_target: path,
+          share_with: id,
+          share_with_displayname: id
+        }
+      }),
+    shareFileWithGroup: () => Promise.resolve(),
+    updateShare: (id, params) => {
+      const share = {
+        shareInfo: {
+          id,
+          share_type: 0,
+          uid_owner: 'alice', // TODO: get user dynamically
+          displayname_owner: 'alice', // TODO: get user dynamically
+          permissions: params.permissions,
+          stime: new Date().getTime(),
+          uid_file_owner: 'alice', // TODO: get user dynamically
+          displayname_file_owner: 'alice', // TODO: get user dynamically
+          path: '/Documents', // TODO: get path dynamically
+          item_type: 'folder', // TODO: get item type dynamically
+          item_source: 10,
+          file_source: 10,
+          file_parent: 6,
+          file_target: '/Documents', // TODO: get path dynamically
+          share_with: 'bob', // TODO: get user dynamically
+          share_with_displayname: 'bob' // TODO: get user dynamically
+        }
+      }
+
+      if (params.expireDate) {
+        share.shareInfo.expiration = params.expireDate
+      }
+
+      return Promise.resolve(share)
+    }
   }
 }
+
+function getRecipients(query) {
+  const users = fixtureRecipients.users.filter(user => user.label.includes(query))
+
+  return { exact: { users, groups: [], remotes: [] }, users: [], groups: [], remotes: [] }
+}
diff --git a/package.json b/package.json
index ce738a6cd77..7f6f110fc27 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-typescript": "^8.2.5",
     "@testing-library/jest-dom": "^5.13.0",
+    "@testing-library/user-event": "^13.2.1",
     "@testing-library/vue": "^5.6.2",
     "@types/cucumber": "^7.0.0",
     "@types/jest": "^26.0.23",
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/AutocompleteItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/AutocompleteItem.vue
index 8ddfb21dd2d..5f3b3b32028 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/AutocompleteItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/AutocompleteItem.vue
@@ -1,5 +1,9 @@
 <template>
-  <div class="uk-flex uk-flex-middle oc-py-xs" :class="collaboratorClass">
+  <div
+    :data-testid="`recipient-autocomplete-item-${item.label}`"
+    class="uk-flex uk-flex-middle oc-py-xs"
+    :class="collaboratorClass"
+  >
     <avatar-image
       v-if="isUser"
       class="oc-mr-s"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue
index 71fad8fd66f..854fc3a3e5e 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue
@@ -1,12 +1,11 @@
 <template>
-  <div>
+  <div class="recipient-edit-options">
     <hr />
     <oc-button
       id="files-collaborators-role-button"
       appearance="raw"
       justify-content="left"
       gap-size="xsmall"
-      class="oc-mr-s"
     >
       <translate v-if="isAdvancedRoleSelected" key="advanced-permissions-select"
         >Invite with custom permissions</translate
@@ -42,10 +41,12 @@
         :max-date="maxExpirationDate"
         :locale="$language.current"
         class="files-recipient-expiration-datepicker"
+        data-testid="recipient-datepicker"
       >
         <template #default="{ togglePopover }">
           <oc-button
             id="files-collaborators-expiration-button"
+            data-testid="recipient-datepicker-btn"
             appearance="raw"
             justify-content="left"
             gap-size="xsmall"
@@ -61,10 +62,19 @@
             >
               Expires %{expires}
             </translate>
-            <oc-icon name="expand_more" />
+            <oc-icon v-if="!enteredExpirationDate" name="expand_more" />
           </oc-button>
         </template>
       </date-picker>
+      <oc-button
+        v-if="!expirationDateEnforced && enteredExpirationDate"
+        data-testid="recipient-edit-expiration-btn-remove"
+        appearance="raw"
+        :aria-label="$gettext('Remove expiration date')"
+        @click="clearExpirationDate"
+      >
+        <oc-icon name="close" />
+      </oc-button>
     </template>
     <template v-if="$_ocCollaborators_hasAdditionalPermissions">
       <label v-if="!isAdvancedRoleSelected" class="oc-label oc-mt-s">
@@ -374,12 +384,22 @@ export default {
 
     disabledExpirationDates(date) {
       return date < this.minExpirationDate || date > this.maxExpirationDate
+    },
+
+    clearExpirationDate() {
+      this.enteredExpirationDate = null
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+.recipient-edit-options {
+  align-items: center;
+  display: flex;
+  gap: var(--oc-space-small);
+}
+
 .files-recipient-role-drop {
   &-list {
     background-color: var(--oc-color-swatch-inverse-default);
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditCollaborator.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditCollaborator.vue
index 742aeb94c4d..1c693f3d948 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditCollaborator.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditCollaborator.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="files-collaborators-collaborator-edit-dialog">
+  <div data-testid="recipient-dialog-edit" class="files-collaborators-collaborator-edit-dialog">
     <h4
       id="collaborator-edit-hint"
       tabindex="-1"
@@ -58,6 +58,7 @@
           v-else
           id="files-collaborators-collaborator-save-share-button"
           key="edit-collaborator-saving-button"
+          data-testid="recipient-edit-btn-save"
           :aria-label="$gettext('Save Share')"
           :disabled="!$_hasChanges"
           variation="primary"
@@ -155,15 +156,10 @@ export default {
         // if the role has changed, always return true. The user doesn't need to understand if two bitmasks of different roles are the same!
         return true
       }
-      // FIXME: Datepicker is not displaying correct timezone so for now we add it manually
-      const originalExpirationDate = this.originalExpirationDate
-      // ? DateTime.fromJSDate(this.originalExpirationDate)
-      //     .plus({ minutes: DateTime.now().offset })
-      //     .toISO()
-      // : null
-
-      const exactExpirationDate = DateTime.fromISO(this.expirationDate).ts
-      const exactOriginalExpirationDate = DateTime.fromISO(originalExpirationDate).ts
+      const exactExpirationDate = this.expirationDate
+        ? DateTime.fromISO(this.expirationDate).ts
+        : null
+      const exactOriginalExpirationDate = DateTime.fromISO(this.originalExpirationDate).ts
 
       if (exactExpirationDate !== exactOriginalExpirationDate) {
         return true
@@ -201,7 +197,7 @@ export default {
         // Map bitmask to role to get the correct role in case the advanced role was mapped to existing role
         role: bitmaskToRole(bitmask, this.highlightedFile.type === 'folder', !this.isOcis),
         permissions: bitmask,
-        expirationDate: this.expirationDate
+        expirationDate: this.expirationDate || ''
       })
         .then(() => this.$_ocCollaborators_cancelChanges())
         .catch(errors => {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/NewCollaborator.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/NewCollaborator.vue
index 47195ba8c3d..46e81bdc3d5 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/NewCollaborator.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/NewCollaborator.vue
@@ -1,10 +1,11 @@
 <template>
-  <div class="files-collaborators-collaborator-add-dialog">
+  <div class="files-collaborators-collaborator-add-dialog" data-testid="new-collaborator">
     <div class="oc-mb">
       <oc-select
         id="files-share-invite-input"
         ref="ocSharingAutocomplete"
         v-model="selectedCollaborators"
+        data-testid="new-collaborator-select"
         :options="autocompleteResults"
         :loading="searchInProgress"
         :multiple="true"
@@ -60,6 +61,7 @@
           v-else
           id="files-collaborators-collaborator-save-new-share-button"
           key="new-collaborator-save-button"
+          data-testid="new-collaborator-share-btn"
           :disabled="!$_isValid"
           variation="primary"
           appearance="filled"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RecipientContainer.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RecipientContainer.vue
index c8cab7b77c4..e6fc7def1df 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RecipientContainer.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RecipientContainer.vue
@@ -1,5 +1,9 @@
 <template>
-  <oc-recipient class="files-share-invite-recipient" :recipient="formattedRecipient">
+  <oc-recipient
+    :data-testid="`recipient-container-${formattedRecipient.name}`"
+    class="files-share-invite-recipient"
+    :recipient="formattedRecipient"
+  >
     <template #append>
       <oc-button
         class="files-share-invite-recipient-btn-remove"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ShowCollaborator.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ShowCollaborator.vue
index 8478c0c4ce0..313de7f78fa 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ShowCollaborator.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ShowCollaborator.vue
@@ -1,5 +1,10 @@
 <template>
-  <oc-table-simple top class="files-collaborators-collaborator" role="presentation">
+  <oc-table-simple
+    :data-testid="`collaborator-item-${collaborator.collaborator.name}`"
+    top
+    class="files-collaborators-collaborator"
+    role="presentation"
+  >
     <oc-tr class="files-collaborators-collaborator-table-row-info">
       <oc-td width="shrink" class="oc-py-rm oc-pr-s">
         <div key="collaborator-avatar-loaded">
@@ -124,7 +129,10 @@
               </oc-tag>
             </li>
             <li v-if="collaborator.expires" class="oc-py-rm">
-              <oc-tag class="files-collaborators-collaborator-expires">
+              <oc-tag
+                data-testid="recipient-info-expiration-date"
+                class="files-collaborators-collaborator-expires"
+              >
                 <oc-icon name="text-calendar" />
                 <translate :translate-params="{ expires: expirationDate }">
                   Expires %{expires}
@@ -154,6 +162,7 @@
           <oc-button
             v-if="$_editButtonVisible"
             v-oc-tooltip="editShareHint"
+            :data-testid="`recipient-${collaborator.collaborator.name}-btn-edit`"
             :aria-label="editShareHint"
             appearance="raw"
             class="files-collaborators-collaborator-edit oc-mr-xs"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 0856ed3112b..731a731fb94 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -10,6 +10,7 @@
         <div v-if="$_ocCollaborators_canShare" class="oc-mt-s oc-mb-s">
           <oc-button
             ref="addCollaborators"
+            data-testid="file-shares-add-btn"
             variation="primary"
             class="files-collaborators-open-add-share-dialog-button"
             @click="$_ocCollaborators_addShare"
@@ -28,6 +29,7 @@
           <h4 v-if="hasSharees" class="shared-with-label" v-text="sharedWithLabel" />
           <oc-button
             v-oc-tooltip="sharedWithTooltip"
+            data-testid="collaborators-show-people"
             appearance="raw"
             :aria-label="sharedWithTooltip"
             @click="onClickSharedWith"
diff --git a/packages/web-app-files/tests/integration/helpers/date.js b/packages/web-app-files/tests/integration/helpers/date.js
new file mode 100644
index 00000000000..2db87343457
--- /dev/null
+++ b/packages/web-app-files/tests/integration/helpers/date.js
@@ -0,0 +1,12 @@
+/**
+ * Adds a given number of days to the current date
+ * @param {number} days number of days to be added to the current date
+ * @returns date in the future with added days
+ */
+export function getDateInFuture(days) {
+  const date = new Date()
+
+  date.setDate(new Date().getDate() + days)
+
+  return date
+}
diff --git a/packages/web-app-files/tests/integration/specs/peopleExpirationDate.spec.js b/packages/web-app-files/tests/integration/specs/peopleExpirationDate.spec.js
new file mode 100644
index 00000000000..95410b4ff2b
--- /dev/null
+++ b/packages/web-app-files/tests/integration/specs/peopleExpirationDate.spec.js
@@ -0,0 +1,451 @@
+import '@testing-library/jest-dom'
+import { render, fireEvent, waitFor, within } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import merge from 'lodash-es/merge'
+
+import StoreFiles from '@files/src/store'
+import Store from '@runtime/src/store'
+import routes from '@files/src/routes'
+import { getDateInFuture } from '../helpers/date'
+// eslint-disable-next-line jest/no-mocks-import
+import sdkMock from '@/__mocks__/sdk'
+
+import FileShares from '@files/src/components/SideBar/Shares/FileShares.vue'
+
+const existingShares = [
+  {
+    shareInfo: {
+      id: 1,
+      share_type: 0,
+      uid_owner: 'alice',
+      displayname_owner: 'alice',
+      permissions: 16,
+      stime: new Date().getTime(),
+      expiration: getDateInFuture(2).toISOString(),
+      uid_file_owner: 'alice',
+      displayname_file_owner: 'alice',
+      path: '/Documents',
+      item_type: 'folder',
+      item_source: 10,
+      file_source: 10,
+      file_parent: 6,
+      file_target: '/Documents',
+      share_with: 'bob',
+      share_with_displayname: 'bob'
+    }
+  }
+]
+
+describe('Users can set expiration date when sharing with users or groups', () => {
+  test('user can set a new expiration date', async () => {
+    const { findByTestId, baseElement, getByTestId, findByText, queryByTestId } = renderComponent()
+
+    const addBtn = await findByTestId('file-shares-add-btn')
+
+    expect(addBtn).toBeVisible()
+    await fireEvent.click(addBtn)
+    expect(await findByTestId('new-collaborator')).toBeVisible()
+    await fireEvent.update(baseElement.querySelector('#files-share-invite-input'), 'bob')
+    await waitFor(() => expect(baseElement.querySelector('#vs1__listbox')).toBeVisible())
+
+    const userInAutocomplete = await findByTestId('recipient-autocomplete-item-bob')
+    expect(userInAutocomplete).toBeVisible()
+    userEvent.click(userInAutocomplete)
+    expect(await findByTestId('recipient-container-bob')).toBeVisible()
+    expect(getByTestId('recipient-datepicker')).toBeVisible()
+    await fireEvent.click(getByTestId('recipient-datepicker-btn'))
+
+    const newDate = getDateInFuture(2)
+    const dateSelector = document.evaluate(
+      `//span[contains(@class, "vc-day-content vc-focusable") and text()="${newDate.getDate()}"]`,
+      baseElement,
+      null,
+      XPathResult.FIRST_ORDERED_NODE_TYPE,
+      null
+    ).singleNodeValue
+
+    if (dateSelector.classList.contains('is-disabled')) {
+      const nextMonthBtn = baseElement.querySelector('.vc-arrow.is-right')
+
+      userEvent.click(nextMonthBtn)
+    }
+
+    expect(
+      await findByText(newDate.toLocaleString('en', { month: 'long', year: 'numeric' }))
+    ).toBeVisible()
+    userEvent.click(dateSelector)
+    expect(await findByText('Expires in 2 days')).toBeVisible()
+
+    const shareBtn = getByTestId('new-collaborator-share-btn')
+    expect(shareBtn).toBeVisible()
+    await fireEvent.click(shareBtn)
+    await waitFor(() => {
+      return expect(queryByTestId('new-collaborator')).toBe(null)
+    })
+
+    const showPeopleBtn = await findByTestId('collaborators-show-people')
+    expect(showPeopleBtn).toBeVisible()
+    await fireEvent.click(showPeopleBtn)
+    expect(await findByTestId('collaborator-item-bob')).toBeVisible()
+    expect(
+      within(getByTestId('recipient-info-expiration-date')).getByText('Expires in 2 days')
+    ).toBeVisible()
+  })
+
+  test('user can edit an existing expiration date', async () => {
+    const { findByTestId, baseElement, getByTestId, findByText, queryByTestId } = renderComponent({
+      mocks: {
+        $client: merge(sdkMock, {
+          shares: {
+            getShares: () => Promise.resolve(existingShares)
+          }
+        })
+      }
+    })
+
+    const showPeopleBtn = await findByTestId('collaborators-show-people')
+    expect(showPeopleBtn).toBeVisible()
+    await fireEvent.click(showPeopleBtn)
+
+    const recipientBob = await findByTestId('collaborator-item-bob')
+
+    expect(recipientBob).toBeVisible()
+    expect(within(recipientBob).getByText('Expires in 2 days')).toBeVisible()
+
+    const editBtn = getByTestId('recipient-bob-btn-edit')
+    expect(editBtn).toBeVisible()
+    await fireEvent.click(editBtn)
+
+    const editDialog = await findByTestId('recipient-dialog-edit')
+
+    expect(editDialog).toBeVisible()
+    expect(getByTestId('recipient-datepicker')).toBeVisible()
+    await fireEvent.click(getByTestId('recipient-datepicker-btn'))
+
+    const newDate = getDateInFuture(4)
+    const dateSelector = document.evaluate(
+      `//span[contains(@class, "vc-day-content vc-focusable") and text()="${newDate.getDate()}"]`,
+      baseElement,
+      null,
+      XPathResult.FIRST_ORDERED_NODE_TYPE,
+      null
+    ).singleNodeValue
+
+    if (dateSelector.classList.contains('is-disabled')) {
+      const nextMonthBtn = baseElement.querySelector('.vc-arrow.is-right')
+
+      userEvent.click(nextMonthBtn)
+    }
+
+    expect(
+      await findByText(newDate.toLocaleString('en', { month: 'long', year: 'numeric' }))
+    ).toBeVisible()
+    userEvent.click(dateSelector)
+    expect(await within(editDialog).findByText('Expires in 4 days')).toBeVisible()
+    await fireEvent.click(getByTestId('recipient-edit-btn-save'))
+    await waitFor(() => expect(queryByTestId('recipient-dialog-edit')).toBe(null))
+    expect(recipientBob).toBeVisible()
+    expect(within(recipientBob).getByText('Expires in 4 days')).toBeVisible()
+  })
+
+  test('user can remove an existing expiration date', async () => {
+    const { findByTestId, getByTestId, queryByTestId } = renderComponent({
+      mocks: {
+        $client: merge(sdkMock, {
+          shares: {
+            getShares: () => Promise.resolve(existingShares)
+          }
+        })
+      }
+    })
+
+    const showPeopleBtn = await findByTestId('collaborators-show-people')
+    expect(showPeopleBtn).toBeVisible()
+    await fireEvent.click(showPeopleBtn)
+
+    const recipientBob = await findByTestId('collaborator-item-bob')
+
+    expect(recipientBob).toBeVisible()
+    expect(within(recipientBob).getByText('Expires in 2 days')).toBeVisible()
+
+    const editBtn = getByTestId('recipient-bob-btn-edit')
+    expect(editBtn).toBeVisible()
+    await fireEvent.click(editBtn)
+
+    const editDialog = await findByTestId('recipient-dialog-edit')
+    const removeExpirationBtn = getByTestId('recipient-edit-expiration-btn-remove')
+
+    expect(editDialog).toBeVisible()
+    expect(removeExpirationBtn).toBeVisible()
+    await fireEvent.click(removeExpirationBtn)
+    expect(await within(editDialog).findByText('Set expiration date')).toBeVisible()
+    await fireEvent.click(getByTestId('recipient-edit-btn-save'))
+    await waitFor(() => expect(queryByTestId('recipient-dialog-edit')).toBe(null))
+    expect(recipientBob).toBeVisible()
+    expect(within(recipientBob).queryByTestId('recipient-info-expiration-date')).toBe(null)
+  })
+
+  test.todo('default expiration is set on new shares')
+  test.todo('user can set expiration date within enforced maximum date')
+  test.todo('user cannot set expiration date beyond enforced maximum date')
+  test.todo('user can edit expiration date within enforced maximum date')
+  test.todo('enforced expiration date for groups does not affect user shares')
+  test.todo('enforced expiration date for users does not affect group shares')
+  test.todo(
+    'new enforced default expiration date does not change expiration date of previously created share'
+  )
+  test.todo(
+    'new enforced default expiration date does not change expiration date of previously created share which is beyond the new maximum enforced date'
+  )
+})
+
+function renderComponent({ store, mocks } = {}) {
+  return render(
+    FileShares,
+    {
+      store: merge(
+        {
+          ...Store,
+          modules: {
+            ...Store.modules,
+            user: {
+              ...Store.modules.user,
+              state: {
+                ...Store.modules.user.state,
+                id: 'alice',
+                capabilities: {
+                  files_sharing: {
+                    search_min_length: 2,
+                    group: { expire_date: { enabled: false } },
+                    user: {
+                      send_mail: false,
+                      profile_picture: true,
+                      expire_date: { enabled: false }
+                    }
+                  }
+                }
+              }
+            },
+            Files: {
+              ...StoreFiles,
+              state: {
+                ...StoreFiles.state,
+                incomingSharesLoading: false
+              },
+              getters: {
+                ...StoreFiles.getters,
+                highlightedFile: () => ({
+                  type: 'folder',
+                  path: '/documents',
+                  canShare: () => true
+                }),
+                currentFileOutgoingSharesLoading: () => false,
+                sharesTreeLoading: () => false
+              }
+            }
+          }
+        },
+        store
+      ),
+      stubs: {
+        'avatar-image': true
+      },
+      routes,
+      mocks
+    },
+    (vue, store, router) => {
+      router.push({ name: 'personal' })
+    }
+  )
+}
+
+// Scenario: share a file with another internal user with default expiration date
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
+//     And default expiration date for users is set to 3 days
+//     And user "Alice" has logged in using the webUI
+//     When the user shares file "testimage.jpg" with user "Brian Murphy" using the webUI
+//     And user "Brian" accepts the share "testimage.jpg" offered by user "Alice" using the sharing API
+//     Then user "Brian" should have received a share with target "Shares/testimage.jpg" and expiration date in 3 days
+
+//   @issue-4169
+//   Scenario: share a resource with another internal user with expiration date within enforced maximum expiration date
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has logged in using the webUI
+//     When the user shares file "lorem.txt" with user "Brian Murphy" which expires in "+4" days using the webUI
+//     And user "Brian" accepts the share "lorem.txt" offered by user "Alice" using the sharing API
+//     Then user "Alice" should have a share with these details:
+//       | field       | value             |
+//       | path        | /lorem.txt        |
+//       | file_target | /Shares/lorem.txt |
+//       | share_type  | user              |
+//       | uid_owner   | Alice             |
+//       | share_with  | Brian             |
+//       | expiration  | +4                |
+
+//   @issue-4169
+//   Scenario Outline: share a resource with another internal user with expiration date beyond enforced maximum expiration date
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created folder "simple-folder"
+//     And user "Alice" has logged in using the webUI
+//     When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
+//     Then the expiration date shown on the webUI should be "+5" days
+//     And user "Alice" should not have created any shares
+//     Examples:
+//       | shared-resource |
+//       | lorem.txt       |
+//       | simple-folder   |
+
+//   @issue-4169
+//   Scenario Outline: edit a share with another internal user changing expiration date within enforced maximum expiration date
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created folder "simple-folder"
+//     And user "Alice" has created a new share with following settings
+//       | path       | <shared-resource> |
+//       | shareWith  | Brian             |
+//       | expireDate | +4                |
+//     And user "Alice" has logged in using the webUI
+//     When the user tries to edit the collaborator expiry date of "Brian Murphy" of resource "<shared-resource>" to "+7" days using the webUI
+//     Then the expiration date shown on the webUI should be "+4" days
+//     And it should not be possible to save the pending share on the webUI
+//     Examples:
+//       | shared-resource |
+//       | lorem.txt       |
+//       | simple-folder   |
+
+//   @issue-4169
+//   Scenario: user cannot concurrently update the role and date of a share after the system maximum expiry date has been reduced
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created a new share with following settings
+//       | path             | lorem.txt |
+//       | shareWith        | Brian     |
+//       | expireDate       | +30       |
+//       | permissionString | read      |
+//     And user "Alice" has logged in using the webUI
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
+//     When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
+//       | expireDate       | +15    |
+//       | permissionString | Editor |
+//     Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
+//     And user "Alice" should have a share with these details:
+//       | field       | value      |
+//       | path        | /lorem.txt |
+//       | share_type  | user       |
+//       | uid_owner   | Alice      |
+//       | share_with  | Brian      |
+//       | expiration  | +30        |
+//       | permissions | read       |
+
+//   @issue-4169
+//   Scenario: user cannot update the date of a share after the system maximum expiry date has been reduced
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created a new share with following settings
+//       | path       | lorem.txt |
+//       | shareWith  | Brian     |
+//       | expireDate | +30       |
+//     And user "Alice" has logged in using the webUI
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
+//     When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
+//       | expireDate | +15 |
+//     Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
+//     And user "Alice" should have a share with these details:
+//       | field      | value      |
+//       | path       | /lorem.txt |
+//       | share_type | user       |
+//       | uid_owner  | Alice      |
+//       | share_with | Brian      |
+//       | expiration | +30        |
+
+//   @issue-3174 @issue-4169
+//   Scenario Outline: enforced expiry date for group affect user shares
+//     Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
+//     And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "5"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created folder "simple-folder"
+//     And user "Alice" has logged in using the webUI
+//     When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
+//     Then the expiration date shown on the webUI should be "+5" days
+// #    Then the expiration date shown on the webUI should be "+6" days
+// #    Then user "Alice" should have a share with these details:
+// #      | field      | value             |
+// #      | path       | <shared-resource> |
+// #      | share_type | user              |
+// #      | uid_owner  | Alice             |
+// #      | share_with | Brian             |
+// #      | expiration | +6                |
+//     Examples:
+//       | shared-resource |
+//       | lorem.txt       |
+//       | simple-folder   |
+
+//   @issue-3174 @issue-4169
+//   Scenario Outline: enforced expiry date for users affect group sharess
+//     Given group "grp1" has been created
+//     And user "Brian" has been added to group "grp1"
+//     And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
+//     And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "10"
+//     And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created folder "simple-folder"
+//     And user "Alice" has logged in using the webUI
+//     When the user tries to share resource "<shared-resource>" with group "grp1" which expires in "+6" days using the webUI
+//     Then the expiration date shown on the webUI should be "+5" days
+// #    Then the expiration date shown on the webUI should be "+6" days
+// #    Then user "Alice" should have a share with these details:
+// #      | field      | value             |
+// #      | path       | <shared-resource> |
+// #      | share_type | group             |
+// #      | uid_owner  | Alice             |
+// #      | share_with | grp1              |
+// #      | expiration | +6                |
+//     Examples:
+//       | shared-resource |
+//       | lorem.txt       |
+//       | simple-folder   |
+
+//   @issue-4169
+//   Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share
+//     Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created a new share with following settings
+//       | path      | lorem.txt |
+//       | shareWith | Brian     |
+//     And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     When user "Alice" logs in using the webUI
+//     Then the share "lorem.txt" shared with user "Brian Murphy" should have no expiration information displayed on the webUI
+
+//   @issue-4169
+//   Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share which is beyond the new maximum date(enforced)
+//     Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
+//     And user "Alice" has created a new share with following settings
+//       | path       | lorem.txt |
+//       | shareWith  | Brian     |
+//       | expireDate | +14       |
+//     And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+//     And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
+//     And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
+//     When user "Alice" logs in using the webUI
+//     Then the expiration information displayed on the webUI of share "lorem.txt" shared with user "Brian Murphy" should be "Expires in 15 days" or "Expires in 14 days"
diff --git a/tests/acceptance/features/webUISharingExpirationDate/shareWithExpirationDate.feature b/tests/acceptance/features/webUISharingExpirationDate/shareWithExpirationDate.feature
new file mode 100644
index 00000000000..a4ad3faf512
--- /dev/null
+++ b/tests/acceptance/features/webUISharingExpirationDate/shareWithExpirationDate.feature
@@ -0,0 +1,25 @@
+@issue-4169 @smokeTest
+Feature: Sharing files and folders with internal users with expiry date
+  As a user
+  I want to be able to set an expiry date on my shares
+  So that I don't have to remember to unshare
+
+  Background:
+    Given these users have been created with default attributes and without skeleton files:
+      | username |
+      | Alice    |
+      | Brian    |
+
+  @notToImplementOnOCIS
+  Scenario: share a file with another internal user which should expire after 2 days
+    Given user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
+    And user "Alice" has logged in using the webUI
+    When the user shares file "testimage.jpg" with user "Brian Murphy" which expires in "+2" days using the webUI
+    Then user "Brian" should have received a share with target "testimage.jpg" and expiration date in 2 days
+  
+  Scenario: share a file with another internal user which should expire after 2 days with shares mounted in "Shares"
+    Given the administrator has set the default folder for received shares to "Shares"
+    And user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
+    And user "Alice" has logged in using the webUI
+    When the user shares file "testimage.jpg" with user "Brian Murphy" which expires in "+2" days using the webUI
+    Then user "Brian" should have received a share with target "Shares/testimage.jpg" and expiration date in 2 days
diff --git a/tests/acceptance/features/webUISharingInternalUsersExpire/shareWithUsersExpiringShares.feature b/tests/acceptance/features/webUISharingInternalUsersExpire/shareWithUsersExpiringShares.feature
deleted file mode 100644
index 70345f21c99..00000000000
--- a/tests/acceptance/features/webUISharingInternalUsersExpire/shareWithUsersExpiringShares.feature
+++ /dev/null
@@ -1,249 +0,0 @@
-Feature: Sharing files and folders with internal users with expiry date
-  As a user
-  I want to be able to set an expiry date on my shares
-  So that I don't have to remember to unshare
-
-  Background:
-    Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no"
-    And the administrator has set the default folder for received shares to "Shares"
-    And these users have been created with default attributes and without skeleton files:
-      | username |
-      | Alice    |
-      | Brian    |
-
-  @issue-4169
-  Scenario: share a file with another internal user which should expire after 2 days
-    Given user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
-    And user "Alice" has logged in using the webUI
-    When the user shares file "testimage.jpg" with user "Brian Murphy" which expires in "+2" days using the webUI
-    And user "Brian" accepts the share "testimage.jpg" offered by user "Alice" using the sharing API
-    Then user "Brian" should have received a share with target "Shares/testimage.jpg" and expiration date in 2 days
-
-  @issue-4169
-  Scenario: share a file with another internal user with default expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
-    And default expiration date for users is set to 3 days
-    And user "Alice" has logged in using the webUI
-    When the user shares file "testimage.jpg" with user "Brian Murphy" using the webUI
-    And user "Brian" accepts the share "testimage.jpg" offered by user "Alice" using the sharing API
-    Then user "Brian" should have received a share with target "Shares/testimage.jpg" and expiration date in 3 days
-
-  @issue-4169
-  Scenario: change existing expiration date of an existing share with another internal user
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +14       |
-    And user "Brian" has accepted the share "lorem.txt" offered by user "Alice"
-    And user "Alice" has logged in using the webUI
-    When the user edits the collaborator expiry date of "Brian Murphy" of file "lorem.txt" to "+7" days using the webUI
-    Then user "Brian" should have received a share with target "Shares/lorem.txt" and expiration date in 7 days
-    And user "Alice" should have a share with these details:
-      | field       | value             |
-      | path        | /lorem.txt        |
-      | file_target | /Shares/lorem.txt |
-      | share_type  | user              |
-      | uid_owner   | Alice             |
-      | share_with  | Brian             |
-      | expiration  | +7                |
-
-  @issue-4169
-  Scenario: share a resource with another internal user with expiration date within enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has logged in using the webUI
-    When the user shares file "lorem.txt" with user "Brian Murphy" which expires in "+4" days using the webUI
-    And user "Brian" accepts the share "lorem.txt" offered by user "Alice" using the sharing API
-    Then user "Alice" should have a share with these details:
-      | field       | value             |
-      | path        | /lorem.txt        |
-      | file_target | /Shares/lorem.txt |
-      | share_type  | user              |
-      | uid_owner   | Alice             |
-      | share_with  | Brian             |
-      | expiration  | +4                |
-
-  @issue-4169
-  Scenario Outline: share a resource with another internal user with expiration date beyond enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-    And user "Alice" should not have created any shares
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-  @issue-4169
-  Scenario Outline: edit a share with another internal user changing expiration date within enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has created a new share with following settings
-      | path       | <shared-resource> |
-      | shareWith  | Brian             |
-      | expireDate | +4                |
-    And user "Alice" has logged in using the webUI
-    When the user tries to edit the collaborator expiry date of "Brian Murphy" of resource "<shared-resource>" to "+7" days using the webUI
-    Then the expiration date shown on the webUI should be "+4" days
-    And it should not be possible to save the pending share on the webUI
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-  @issue-4169
-  Scenario: user cannot concurrently update the role and date of a share after the system maximum expiry date has been reduced
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path             | lorem.txt |
-      | shareWith        | Brian     |
-      | expireDate       | +30       |
-      | permissionString | read      |
-    And user "Alice" has logged in using the webUI
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
-      | expireDate       | +15    |
-      | permissionString | Editor |
-    Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
-    And user "Alice" should have a share with these details:
-      | field       | value      |
-      | path        | /lorem.txt |
-      | share_type  | user       |
-      | uid_owner   | Alice      |
-      | share_with  | Brian      |
-      | expiration  | +30        |
-      | permissions | read       |
-
-  @issue-4169
-  Scenario: user cannot update the date of a share after the system maximum expiry date has been reduced
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +30       |
-    And user "Alice" has logged in using the webUI
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
-      | expireDate | +15 |
-    Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
-    And user "Alice" should have a share with these details:
-      | field      | value      |
-      | path       | /lorem.txt |
-      | share_type | user       |
-      | uid_owner  | Alice      |
-      | share_with | Brian      |
-      | expiration | +30        |
-
-  @issue-3174 @issue-4169
-  Scenario Outline: enforced expiry date for group affect user shares
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-#    Then the expiration date shown on the webUI should be "+6" days
-#    Then user "Alice" should have a share with these details:
-#      | field      | value             |
-#      | path       | <shared-resource> |
-#      | share_type | user              |
-#      | uid_owner  | Alice             |
-#      | share_with | Brian             |
-#      | expiration | +6                |
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-  @issue-3174 @issue-4169
-  Scenario Outline: enforced expiry date for users affect group sharess
-    Given group "grp1" has been created
-    And user "Brian" has been added to group "grp1"
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "10"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with group "grp1" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-#    Then the expiration date shown on the webUI should be "+6" days
-#    Then user "Alice" should have a share with these details:
-#      | field      | value             |
-#      | path       | <shared-resource> |
-#      | share_type | group             |
-#      | uid_owner  | Alice             |
-#      | share_with | grp1              |
-#      | expiration | +6                |
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-  @issue-4169
-  Scenario: change existing expiration date of an existing share to a date beyond the enforced maximum expiry date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +7        |
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And user "Alice" has logged in using the webUI
-    When the user tries to edit the collaborator expiry date of "Brian Murphy" of resource "lorem.txt" to "+14" days using the webUI
-    Then the expiration date field should be marked as required on the webUI
-    And the expiration date for "+14 days" should be disabled on the webUI
-    And the expiration date shown on the webUI should be "+7" days
-    And it should not be possible to save the pending share on the webUI
-
-  @issue-4169
-  Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path      | lorem.txt |
-      | shareWith | Brian     |
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    When user "Alice" logs in using the webUI
-    Then the share "lorem.txt" shared with user "Brian Murphy" should have no expiration information displayed on the webUI
-
-  @issue-4169
-  Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share which is beyond the new maximum date(enforced)
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +14       |
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    When user "Alice" logs in using the webUI
-    Then the expiration information displayed on the webUI of share "lorem.txt" shared with user "Brian Murphy" should be "Expires in 15 days" or "Expires in 14 days"
diff --git a/tests/acceptance/features/webUISharingInternalUsersExpireToRoot/shareWithUsersExpiringShares.feature b/tests/acceptance/features/webUISharingInternalUsersExpireToRoot/shareWithUsersExpiringShares.feature
deleted file mode 100644
index d7b30431f43..00000000000
--- a/tests/acceptance/features/webUISharingInternalUsersExpireToRoot/shareWithUsersExpiringShares.feature
+++ /dev/null
@@ -1,242 +0,0 @@
-@notToImplementOnOCIS
-Feature: Sharing files and folders with internal users with expiry date
-  As a user
-  I want to be able to set an expiry date on my shares
-  So that I don't have to remember to unshare
-
-  Background:
-    Given these users have been created with default attributes and without skeleton files:
-      | username |
-      | Alice    |
-      | Brian    |
-
-
-  Scenario: share a file with another internal user which should expire after 2 days
-    Given user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
-    And user "Alice" has logged in using the webUI
-    When the user shares file "testimage.jpg" with user "Brian Murphy" which expires in "+2" days using the webUI
-    Then user "Brian" should have received a share with target "testimage.jpg" and expiration date in 2 days
-
-
-  Scenario: share a file with another internal user with default expiration date
-    Given user "Alice" has uploaded file "testavatar.jpg" to "testimage.jpg"
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And default expiration date for users is set to 3 days
-    And user "Alice" has logged in using the webUI
-    When the user shares file "testimage.jpg" with user "Brian Murphy" using the webUI
-    Then user "Brian" should have received a share with target "testimage.jpg" and expiration date in 3 days
-
-
-  Scenario: change existing expiration date of an existing share with another internal user
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +14       |
-    And user "Alice" has logged in using the webUI
-    When the user edits the collaborator expiry date of "Brian Murphy" of file "lorem.txt" to "+7" days using the webUI
-    Then user "Brian" should have received a share with target "lorem.txt" and expiration date in 7 days
-    And user "Alice" should have a share with these details:
-      | field      | value      |
-      | path       | /lorem.txt |
-      | share_type | user       |
-      | uid_owner  | Alice      |
-      | share_with | Brian      |
-      | expiration | +7         |
-
-
-  Scenario: share a resource with another internal user with expiration date within enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has logged in using the webUI
-    When the user shares file "lorem.txt" with user "Brian Murphy" which expires in "+4" days using the webUI
-    Then user "Alice" should have a share with these details:
-      | field      | value      |
-      | path       | /lorem.txt |
-      | share_type | user       |
-      | uid_owner  | Alice      |
-      | share_with | Brian      |
-      | expiration | +4         |
-
-
-  Scenario Outline: share a resource with another internal user with expiration date beyond enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-    And user "Alice" should not have created any shares
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-
-  Scenario Outline: edit a share with another internal user changing expiration date within enforced maximum expiration date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has created a new share with following settings
-      | path       | <shared-resource> |
-      | shareWith  | Brian             |
-      | expireDate | +4                |
-    And user "Alice" has logged in using the webUI
-    When the user tries to edit the collaborator expiry date of "Brian Murphy" of resource "<shared-resource>" to "+7" days using the webUI
-    Then the expiration date shown on the webUI should be "+4" days
-    And it should not be possible to save the pending share on the webUI
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-
-  Scenario: user cannot concurrently update the role and date of a share after the system maximum expiry date has been reduced
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path             | lorem.txt |
-      | shareWith        | Brian     |
-      | expireDate       | +30       |
-      | permissionString | read      |
-    And user "Alice" has logged in using the webUI
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
-      | expireDate       | +15    |
-      | permissionString | Editor |
-    Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
-    And user "Alice" should have a share with these details:
-      | field       | value      |
-      | path        | /lorem.txt |
-      | share_type  | user       |
-      | uid_owner   | Alice      |
-      | share_with  | Brian      |
-      | expiration  | +30        |
-      | permissions | read       |
-
-
-  Scenario: user cannot update the date of a share after the system maximum expiry date has been reduced
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "30"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +30       |
-    And user "Alice" has logged in using the webUI
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    When the user tries to edit the collaborator "Brian Murphy" of file "lorem.txt" changing following
-      | expireDate | +15 |
-    Then the user should see an error message on the collaborator share dialog saying "Cannot set expiration date more than 10 days in the future"
-    And user "Alice" should have a share with these details:
-      | field      | value      |
-      | path       | /lorem.txt |
-      | share_type | user       |
-      | uid_owner  | Alice      |
-      | share_with | Brian      |
-      | expiration | +30        |
-
-  @issue-3174
-  Scenario Outline: enforced expiry date for group affect user shares
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "10"
-    And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "5"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with user "Brian Murphy" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-#    Then the expiration date shown on the webUI should be "+6" days
-#    Then user "Alice" should have a share with these details:
-#      | field      | value             |
-#      | path       | <shared-resource> |
-#      | share_type | user              |
-#      | uid_owner  | Alice             |
-#      | share_with | Brian             |
-#      | expiration | +6                |
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-  @issue-3174
-  Scenario Outline: enforced expiry date for users affect group sharess
-    Given group "grp1" has been created
-    And user "Brian" has been added to group "grp1"
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_default_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_enforce_expire_date_group_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "5"
-    And the setting "shareapi_expire_after_n_days_group_share" of app "core" has been set to "10"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created folder "simple-folder"
-    And user "Alice" has logged in using the webUI
-    When the user tries to share resource "<shared-resource>" with group "grp1" which expires in "+6" days using the webUI
-    Then the expiration date shown on the webUI should be "+5" days
-#    Then the expiration date shown on the webUI should be "+6" days
-#    Then user "Alice" should have a share with these details:
-#      | field      | value             |
-#      | path       | <shared-resource> |
-#      | share_type | group             |
-#      | uid_owner  | Alice             |
-#      | share_with | grp1              |
-#      | expiration | +6                |
-    Examples:
-      | shared-resource |
-      | lorem.txt       |
-      | simple-folder   |
-
-
-  Scenario: change existing expiration date of an existing share to a date beyond the enforced maximum expiry date
-    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +7        |
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    And user "Alice" has logged in using the webUI
-    When the user tries to edit the collaborator expiry date of "Brian Murphy" of resource "lorem.txt" to "+14" days using the webUI
-    Then the expiration date field should be marked as required on the webUI
-    And the expiration date for "+14 days" should be disabled on the webUI
-    And the expiration date shown on the webUI should be "+7" days
-    And it should not be possible to save the pending share on the webUI
-
-
-  Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path      | lorem.txt |
-      | shareWith | Brian     |
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    When user "Alice" logs in using the webUI
-    Then the share "lorem.txt" shared with user "Brian Murphy" should have no expiration information displayed on the webUI
-
-
-  Scenario: setting default expiration date and enforcing it does not change the expiration date of a previously created share which is beyond the new maximum date(enforced)
-    Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt"
-    And user "Alice" has created a new share with following settings
-      | path       | lorem.txt |
-      | shareWith  | Brian     |
-      | expireDate | +14       |
-    And the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
-    And the setting "shareapi_expire_after_n_days_user_share" of app "core" has been set to "7"
-    And the setting "shareapi_enforce_expire_date_user_share" of app "core" has been set to "yes"
-    When user "Alice" logs in using the webUI
-    Then the expiration information displayed on the webUI of share "lorem.txt" shared with user "Brian Murphy" should be "Expires in 15 days" or "Expires in 14 days"
diff --git a/tests/integration/config/jest.init.js b/tests/integration/config/jest.init.js
index f27583cd09a..f76a36b1304 100644
--- a/tests/integration/config/jest.init.js
+++ b/tests/integration/config/jest.init.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import { config } from '@vue/test-utils'
 import fetchMock from 'jest-fetch-mock'
 import ODS from 'owncloud-design-system'
+import GetTextPlugin from 'vue-gettext'
 
 // eslint-disable-next-line jest/no-mocks-import
 import sdkMock from '../../../__mocks__/sdk'
@@ -15,6 +16,12 @@ window.IntersectionObserver = jest.fn(() => ({
 
 Vue.use(ODS)
 
+Vue.use(GetTextPlugin, {
+  availableLanguages: ['en'],
+  defaultLanguage: 'en',
+  translations: {}
+})
+
 fetchMock.enableMocks()
 
 try {
@@ -24,25 +31,12 @@ try {
   console.error(error)
 }
 
+// since silent doesn't seem to work in test env for gettext plugin
+// we're manually silencing all warn messages
+console.warn = jest.fn()
+
 config.mocks = {
-  $gettext: str => str,
-  $gettextInterpolate: str => str,
-  $ngettext: str => str,
-  $pgettext: str => str,
   $client: sdkMock,
-  $language: {
-    current: 'en'
-  },
   encodePath,
   isIE11: () => false
 }
-
-// Translate component mock
-Vue.component('Translate', {
-  props: {
-    tag: { type: String, default: 'span' }
-  },
-  render(createElement) {
-    return createElement(this.tag, {}, this.$slots.default)
-  }
-})
diff --git a/yarn.lock b/yarn.lock
index 2734de8c96e..f66977e8be7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1668,6 +1668,13 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
+"@testing-library/user-event@^13.2.1":
+  version "13.2.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.2.1.tgz#7a71a39e50b4a733afbe2916fa2b99966e941f98"
+  integrity sha512-cczlgVl+krjOb3j1625usarNEibI0IFRJrSWX9UsJ1HKYFgCQv9Nb7QAipUDXl3Xdz8NDTsiS78eAkPSxlzTlw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 "@testing-library/vue@^5.6.2":
   version "5.7.0"
   resolved "https://registry.npmjs.org/@testing-library/vue/-/vue-5.7.0.tgz"