diff --git a/webapp/pages/settings/blocked-users.spec.js b/webapp/pages/settings/blocked-users.spec.js
index 8c657392d..ee4348d0e 100644
--- a/webapp/pages/settings/blocked-users.spec.js
+++ b/webapp/pages/settings/blocked-users.spec.js
@@ -1,4 +1,4 @@
-import { config, mount, createLocalVue } from '@vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import BlockedUsers from './blocked-users.vue'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
@@ -9,7 +9,9 @@ const localVue = createLocalVue()
 localVue.use(Styleguide)
 localVue.use(Filters)
 
-config.stubs['nuxt-link'] = '<span><slot /></span>'
+const stubs = {
+  'nuxt-link': true,
+}
 
 describe('blocked-users.vue', () => {
   let wrapper
@@ -35,7 +37,7 @@ describe('blocked-users.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(BlockedUsers, { mocks, localVue })
+      return mount(BlockedUsers, { mocks, localVue, stubs })
     }
 
     beforeEach(() => {
@@ -43,7 +45,7 @@ describe('blocked-users.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.element.tagName).toBe('DIV')
     })
 
     describe('given a list of blocked users', () => {
diff --git a/webapp/pages/settings/data-download.spec.js b/webapp/pages/settings/data-download.spec.js
index b50c8d046..7a71ef3f1 100644
--- a/webapp/pages/settings/data-download.spec.js
+++ b/webapp/pages/settings/data-download.spec.js
@@ -26,7 +26,7 @@ describe('data-download.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })
diff --git a/webapp/pages/settings/delete-account.spec.js b/webapp/pages/settings/delete-account.spec.js
index aa8ffd954..c55e6bf83 100644
--- a/webapp/pages/settings/delete-account.spec.js
+++ b/webapp/pages/settings/delete-account.spec.js
@@ -36,7 +36,7 @@ describe('delete-account.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.delete-data')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })
diff --git a/webapp/pages/settings/embeds.spec.js b/webapp/pages/settings/embeds.spec.js
index 75247ddf0..aa79d1787 100644
--- a/webapp/pages/settings/embeds.spec.js
+++ b/webapp/pages/settings/embeds.spec.js
@@ -36,7 +36,7 @@ describe('embeds.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })
diff --git a/webapp/pages/settings/index.spec.js b/webapp/pages/settings/index.spec.js
index 01d68e029..03ec610bd 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().contains('div')).toBe(true)
+      expect(Wrapper().element.tagName).toBe('DIV')
     })
 
     describe('given form validation errors', () => {
diff --git a/webapp/pages/settings/invites.spec.js b/webapp/pages/settings/invites.spec.js
index cbc8d1765..6db61d853 100644
--- a/webapp/pages/settings/invites.spec.js
+++ b/webapp/pages/settings/invites.spec.js
@@ -26,7 +26,7 @@ describe('invites.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })
diff --git a/webapp/pages/settings/languages.spec.js b/webapp/pages/settings/languages.spec.js
index 0e3665739..5f582e4e2 100644
--- a/webapp/pages/settings/languages.spec.js
+++ b/webapp/pages/settings/languages.spec.js
@@ -26,7 +26,7 @@ describe('languages.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })
diff --git a/webapp/pages/settings/muted-users.spec.js b/webapp/pages/settings/muted-users.spec.js
index b818fa521..74caa8163 100644
--- a/webapp/pages/settings/muted-users.spec.js
+++ b/webapp/pages/settings/muted-users.spec.js
@@ -1,4 +1,4 @@
-import { config, mount, createLocalVue } from '@vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import MutedUsers from './muted-users.vue'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
@@ -9,7 +9,9 @@ const localVue = createLocalVue()
 localVue.use(Styleguide)
 localVue.use(Filters)
 
-config.stubs['nuxt-link'] = '<span><slot /></span>'
+const stubs = {
+  'nuxt-link': true,
+}
 
 describe('muted-users.vue', () => {
   let wrapper
@@ -35,7 +37,7 @@ describe('muted-users.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(MutedUsers, { mocks, localVue })
+      return mount(MutedUsers, { mocks, localVue, stubs })
     }
 
     beforeEach(() => {
@@ -43,7 +45,7 @@ describe('muted-users.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.element.tagName).toBe('DIV')
     })
 
     describe('given a list of muted users', () => {
diff --git a/webapp/pages/settings/my-email-address/index.spec.js b/webapp/pages/settings/my-email-address/index.spec.js
index 808aee3be..87b85a59d 100644
--- a/webapp/pages/settings/my-email-address/index.spec.js
+++ b/webapp/pages/settings/my-email-address/index.spec.js
@@ -1,10 +1,12 @@
-import { config, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import EmailSettingsIndexPage from './index.vue'
 import Vuex from 'vuex'
 
 const localVue = global.localVue
 
-config.stubs['sweetalert-icon'] = '<span><slot /></span>'
+const stubs = {
+  'sweetalert-icon': true,
+}
 
 describe('EmailSettingsIndexPage', () => {
   let store
@@ -43,12 +45,15 @@ describe('EmailSettingsIndexPage', () => {
         store,
         mocks,
         localVue,
+        stubs,
       })
     }
 
     describe('form', () => {
       describe('submit', () => {
-        beforeEach(jest.useFakeTimers)
+        beforeEach(() => {
+          jest.useFakeTimers()
+        })
 
         describe('email unchanged', () => {
           beforeEach(() => {
diff --git a/webapp/pages/settings/my-email-address/verify.spec.js b/webapp/pages/settings/my-email-address/verify.spec.js
index 66407ad1f..4edbb26bd 100644
--- a/webapp/pages/settings/my-email-address/verify.spec.js
+++ b/webapp/pages/settings/my-email-address/verify.spec.js
@@ -1,11 +1,13 @@
-import { config, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import EmailVerifyPage from './verify.vue'
 import Vuex from 'vuex'
 
 const localVue = global.localVue
 
-config.stubs['client-only'] = '<span><slot /></span>'
-config.stubs['sweetalert-icon'] = '<span><slot /></span>'
+const stubs = {
+  'sweetalert-icon': true,
+  'client-only': true,
+}
 
 describe('EmailVerifyPage', () => {
   let store
@@ -108,12 +110,15 @@ describe('EmailVerifyPage', () => {
   })
 
   describe('mount', () => {
-    beforeEach(jest.useFakeTimers)
+    beforeEach(() => {
+      jest.useFakeTimers()
+    })
     const Wrapper = () => {
       return mount(EmailVerifyPage, {
         store,
         mocks,
         localVue,
+        stubs,
       })
     }
 
diff --git a/webapp/pages/settings/my-organizations.spec.js b/webapp/pages/settings/my-organizations.spec.js
index 7f11b9871..6ae4cd74c 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.is('.base-card')).toBe(true)
+      expect(wrapper.element.tagName).toBe('DIV')
     })
   })
 })
diff --git a/webapp/pages/settings/privacy.spec.js b/webapp/pages/settings/privacy.spec.js
index eb9cb90b3..4cabf5e50 100644
--- a/webapp/pages/settings/privacy.spec.js
+++ b/webapp/pages/settings/privacy.spec.js
@@ -47,22 +47,19 @@ describe('privacy.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
 
     it('clicking on submit changes shoutsAllowed to false', async () => {
-      wrapper.find('#allow-shouts').trigger('click')
-      await wrapper.vm.$nextTick()
-      wrapper.find('.base-button').trigger('click')
+      await wrapper.find('#allow-shouts').setChecked(false)
+      await wrapper.find('.base-button').trigger('click')
       expect(wrapper.vm.shoutsAllowed).toBe(false)
     })
 
     it('clicking on submit with a server error shows a toast and shoutsAllowed is still true', async () => {
       mocks.$apollo.mutate = jest.fn().mockRejectedValue({ message: 'Ouch!' })
-      wrapper.find('#allow-shouts').trigger('click')
-      await wrapper.vm.$nextTick()
+      await wrapper.find('#allow-shouts').setChecked(false)
       await wrapper.find('.base-button').trigger('click')
-      await wrapper.vm.$nextTick()
       expect(mocks.$toast.error).toHaveBeenCalledWith('Ouch!')
       expect(wrapper.vm.shoutsAllowed).toBe(true)
     })
diff --git a/webapp/pages/settings/security.spec.js b/webapp/pages/settings/security.spec.js
index dee9e640a..92ef93a0e 100644
--- a/webapp/pages/settings/security.spec.js
+++ b/webapp/pages/settings/security.spec.js
@@ -26,7 +26,7 @@ describe('security.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('.base-card')).toBe(true)
+      expect(wrapper.classes('base-card')).toBe(true)
     })
   })
 })