diff --git a/src/components/App/__snapshots__/test.js.snap b/src/components/App/__snapshots__/test.js.snap
index 5910d8b..cc58273 100644
--- a/src/components/App/__snapshots__/test.js.snap
+++ b/src/components/App/__snapshots__/test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Message rendering 1`] = `
+exports[`App rendering 1`] = `
 <React.Fragment>
   <Translate(Form)
     downloadUrls={
diff --git a/src/components/App/test.js b/src/components/App/test.js
index ea65155..02dbd93 100644
--- a/src/components/App/test.js
+++ b/src/components/App/test.js
@@ -3,9 +3,11 @@ import { shallow } from 'enzyme';
 
 import App from 'components/App';
 
-test('Message rendering', () => {
-  const component = shallow(
-    <App/>
-  );
-  expect(component).toMatchSnapshot();
+describe('App', () => {
+  test('rendering', () => {
+    const component = shallow(
+      <App/>
+    );
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/src/components/Footer/test.js b/src/components/Footer/test.js
index b4e6cbd..77a5576 100644
--- a/src/components/Footer/test.js
+++ b/src/components/Footer/test.js
@@ -3,11 +3,13 @@ import { shallow } from 'enzyme';
 
 import { Footer } from 'components/Footer';
 
-test('Footer rendering', () => {
-  const component = shallow(
-    <Footer>
-      <p>Content</p>
-    </Footer>
-  );
-  expect(component).toMatchSnapshot();
+describe('Footer', () => {
+  test('rendering', () => {
+    const component = shallow(
+      <Footer>
+        <p>Content</p>
+      </Footer>
+    );
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/src/components/Header/test.js b/src/components/Header/test.js
index e7d67d5..a40ce7d 100644
--- a/src/components/Header/test.js
+++ b/src/components/Header/test.js
@@ -5,22 +5,24 @@ import { Header } from 'components/Header';
 
 const env = { ...process.env };
 
-afterEach(() => {
-  process.env = env;
-});
+describe('Header', () => {
+  afterEach(() => {
+    process.env = env;
+  });
 
-beforeEach(() => {
-  process.env = {
-    ...process.env,
-    BANNER: 'testing'
-  };
-});
+  beforeEach(() => {
+    process.env = {
+      ...process.env,
+      BANNER: 'testing'
+    };
+  });
 
-test('Header rendering', () => {
-  const component = shallow(
-    <Header>
-      <p>Content</p>
-    </Header>
-  );
-  expect(component).toMatchSnapshot();
+  test('rendering', () => {
+    const component = shallow(
+      <Header>
+        <p>Content</p>
+      </Header>
+    );
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/src/components/Message/test.js b/src/components/Message/test.js
index a67186d..4052ea7 100644
--- a/src/components/Message/test.js
+++ b/src/components/Message/test.js
@@ -3,30 +3,32 @@ import { shallow, render } from 'enzyme';
 
 import Message from 'components/Message';
 
-test('Message rendering', () => {
-  const component = shallow(
-    <Message heading="Testing" className="testing">
-      <p>Message content</p>
-    </Message>
-  );
-  expect(component).toMatchSnapshot();
-});
+describe('Message', () => {
+  test('rendering', () => {
+    const component = shallow(
+      <Message heading="Testing" className="testing">
+        <p>Message content</p>
+      </Message>
+    );
+    expect(component).toMatchSnapshot();
+  });
 
-test('Message rendering with icon', () => {
-  const Icon = () => 'Sample icon SVG';
-  const component = render(
-    <Message heading="Testing" icon={ Icon }>
-      <p>Message content</p>
-    </Message>
-  );
-  expect(component).toMatchSnapshot();
-});
+  test('rendering with icon', () => {
+    const Icon = () => 'Sample icon SVG';
+    const component = render(
+      <Message heading="Testing" icon={ Icon }>
+        <p>Message content</p>
+      </Message>
+    );
+    expect(component).toMatchSnapshot();
+  });
 
-test('Message rendering with type', () => {
-  const component = render(
-    <Message heading="Testing" type="error">
-      <p>Message content</p>
-    </Message>
-  );
-  expect(component).toMatchSnapshot();
+  test('rendering with type', () => {
+    const component = render(
+      <Message heading="Testing" type="error">
+        <p>Message content</p>
+      </Message>
+    );
+    expect(component).toMatchSnapshot();
+  });
 });