diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 5b51da18e6..e772bf7558 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -189,8 +189,11 @@ const EmojiInput = {
           img: imageUrl || ''
         }))
     },
-    suggestions (newValue) {
-      this.$nextTick(this.resize)
+    suggestions: {
+      handler (newValue) {
+        this.$nextTick(this.resize)
+      },
+      deep: true
     }
   },
   methods: {
diff --git a/test/unit/specs/components/emoji_input.spec.js b/test/unit/specs/components/emoji_input.spec.js
index 045b47fdde..6188308ec8 100644
--- a/test/unit/specs/components/emoji_input.spec.js
+++ b/test/unit/specs/components/emoji_input.spec.js
@@ -1,108 +1,116 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils'
+import { h } from 'vue'
+import { shallowMount } from '@vue/test-utils'
 import EmojiInput from 'src/components/emoji_input/emoji_input.vue'
+import vClickOutside from 'click-outside-vue3'
 
 const generateInput = (value, padEmoji = true) => {
-  const localVue = createLocalVue()
-  localVue.directive('click-outside', () => {})
   const wrapper = shallowMount(EmojiInput, {
-    propsData: {
-      suggest: () => [],
-      enableEmojiPicker: true,
-      value
-    },
-    mocks: {
-      $store: {
-        getters: {
-          mergedConfig: {
-            padEmoji
+    global: {
+      renderStubDefaultSlot: true,
+      mocks: {
+        $store: {
+          getters: {
+            mergedConfig: {
+              padEmoji
+            }
           }
         }
+      },
+      stubs: {
+        FAIcon: true
+      },
+      directives: {
+        'click-outside': vClickOutside
       }
     },
-    slots: {
-      default: '<input />'
+    props: {
+      suggest: () => [],
+      enableEmojiPicker: true,
+      modelValue: value
     },
-    localVue
+    slots: {
+      'default': () => h('input', '')
+    }
   })
-  return [wrapper, localVue]
+  return wrapper
 }
 
 describe('EmojiInput', () => {
   describe('insertion mechanism', () => {
     it('inserts string at the end with trailing space', () => {
       const initialString = 'Testing'
-      const [wrapper] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: initialString.length })
       wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('Testing (test) ')
     })
 
     it('inserts string at the end with trailing space (source has a trailing space)', () => {
       const initialString = 'Testing '
-      const [wrapper] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: initialString.length })
       wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('Testing (test) ')
     })
 
     it('inserts string at the begginning without leading space', () => {
       const initialString = 'Testing'
-      const [wrapper] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: 0 })
       wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('(test) Testing')
     })
 
     it('inserts string between words without creating extra spaces', () => {
       const initialString = 'Spurdo Sparde'
-      const [wrapper] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: 6 })
       wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('Spurdo :ebin: Sparde')
     })
 
     it('inserts string between words without creating extra spaces (other caret)', () => {
       const initialString = 'Spurdo Sparde'
-      const [wrapper] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: 7 })
       wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('Spurdo :ebin: Sparde')
     })
 
     it('inserts string without any padding if padEmoji setting is set to false', () => {
       const initialString = 'Eat some spam!'
-      const [wrapper] = generateInput(initialString, false)
+      const wrapper = generateInput(initialString, false)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: initialString.length, keepOpen: false })
       wrapper.vm.insert({ insertion: ':spam:' })
-      const inputEvents = wrapper.emitted().input
+      const inputEvents = wrapper.emitted()['update:modelValue']
       expect(inputEvents[inputEvents.length - 1][0]).to.eql('Eat some spam!:spam:')
     })
 
     it('correctly sets caret after insertion at beginning', (done) => {
       const initialString = '1234'
-      const [wrapper, vue] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: 0 })
       wrapper.vm.insert({ insertion: '1234', keepOpen: false })
-      vue.nextTick(() => {
+      wrapper.vm.$nextTick(() => {
         expect(wrapper.vm.caret).to.eql(5)
         done()
       })
@@ -110,12 +118,12 @@ describe('EmojiInput', () => {
 
     it('correctly sets caret after insertion at end', (done) => {
       const initialString = '1234'
-      const [wrapper, vue] = generateInput(initialString)
+      const wrapper = generateInput(initialString)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: initialString.length })
       wrapper.vm.insert({ insertion: '1234', keepOpen: false })
-      vue.nextTick(() => {
+      wrapper.vm.$nextTick(() => {
         expect(wrapper.vm.caret).to.eql(10)
         done()
       })
@@ -123,12 +131,12 @@ describe('EmojiInput', () => {
 
     it('correctly sets caret after insertion if padEmoji setting is set to false', (done) => {
       const initialString = '1234'
-      const [wrapper, vue] = generateInput(initialString, false)
+      const wrapper = generateInput(initialString, false)
       const input = wrapper.find('input')
       input.setValue(initialString)
       wrapper.setData({ caret: initialString.length })
       wrapper.vm.insert({ insertion: '1234', keepOpen: false })
-      vue.nextTick(() => {
+      wrapper.vm.$nextTick(() => {
         expect(wrapper.vm.caret).to.eql(8)
         done()
       })