diff --git a/webapp/pages/settings.spec.js b/webapp/pages/settings.spec.js
index 353f1e6b8..0f3c6e22c 100644
--- a/webapp/pages/settings.spec.js
+++ b/webapp/pages/settings.spec.js
@@ -1,9 +1,11 @@
-import { config, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import settings from './settings.vue'
 
 const localVue = global.localVue
 
-config.stubs['nuxt-child'] = '<span class="nuxt-child"><slot /></span>'
+const stubs = {
+  'nuxt-child': true,
+}
 
 describe('settings.vue', () => {
   let wrapper
@@ -20,6 +22,7 @@ describe('settings.vue', () => {
       return mount(settings, {
         mocks,
         localVue,
+        stubs,
       })
     }
 
@@ -28,7 +31,7 @@ describe('settings.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.element.tagName).toBe('DIV')
     })
   })
 })
diff --git a/webapp/pages/settings/index.spec.js b/webapp/pages/settings/index.spec.js
index 03ec610bd..0de675840 100644
--- a/webapp/pages/settings/index.spec.js
+++ b/webapp/pages/settings/index.spec.js
@@ -87,7 +87,7 @@ describe('index.vue', () => {
     })
 
     it('renders', () => {
-      expect(Wrapper().element.tagName).toBe('DIV')
+      expect(Wrapper().element.tagName).toBe('FORM')
     })
 
     describe('given form validation errors', () => {
diff --git a/webapp/pages/settings/my-organizations.spec.js b/webapp/pages/settings/my-organizations.spec.js
index 6ae4cd74c..b6d81bc3d 100644
--- a/webapp/pages/settings/my-organizations.spec.js
+++ b/webapp/pages/settings/my-organizations.spec.js
@@ -26,7 +26,7 @@ describe('my-organizations.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.element.tagName).toBe('DIV')
+      expect(wrapper.element.tagName).toBe('ARTICLE')
     })
   })
 })
diff --git a/webapp/pages/settings/notifications.spec.js b/webapp/pages/settings/notifications.spec.js
index 7b43ef2c4..855505fe2 100644
--- a/webapp/pages/settings/notifications.spec.js
+++ b/webapp/pages/settings/notifications.spec.js
@@ -47,22 +47,19 @@ describe('notifications.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
 
     it('clicking on submit changes notifyByEmail to false', async () => {
-      wrapper.find('#send-email').trigger('click')
-      await wrapper.vm.$nextTick()
-      wrapper.find('.base-button').trigger('click')
+      await wrapper.find('#send-email').setChecked(false)
+      await wrapper.find('.base-button').trigger('click')
       expect(wrapper.vm.notifyByEmail).toBe(false)
     })
 
     it('clicking on submit with a server error shows a toast and notifyByEmail is still true', async () => {
       mocks.$apollo.mutate = jest.fn().mockRejectedValue({ message: 'Ouch!' })
-      wrapper.find('#send-email').trigger('click')
-      await wrapper.vm.$nextTick()
+      await wrapper.find('#send-email').setChecked(false)
       await wrapper.find('.base-button').trigger('click')
-      await wrapper.vm.$nextTick()
       expect(mocks.$toast.error).toHaveBeenCalledWith('Ouch!')
       expect(wrapper.vm.notifyByEmail).toBe(true)
     })