diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index db493b44a..7b28d83fd 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -30,14 +30,34 @@ describe('Message', () => {
       expect(wrapper.find('div.header').exists()).toBe(true)
     })
 
-    it('renders title, subtitle, and button text', () => {
-      expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
-      expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
-      expect(wrapper.find('.test-message-button').text()).toBe('login')
+    describe('with button', () => {
+      it('renders title, subtitle, and button text', () => {
+        expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+        expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+        expect(wrapper.find('.test-message-button').text()).toBe('login')
+      })
+
+      it('button link redirects to /login', () => {
+        expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+      })
     })
 
-    it('button link redirects to /login', () => {
-      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+    describe('without button', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          buttonText: null,
+          linkTo: null,
+        })
+      })
+
+      it('renders title, subtitle, and button text', () => {
+        expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+        expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+      })
+
+      it('button is not shown', () => {
+        expect(wrapper.find('.test-message-button').exists()).toBe(false)
+      })
     })
   })
 })