diff --git a/src/app.vue b/src/app.vue
index 445a1f0ceee879c8bd8259fefac8871adfe0228f..1e5471f7817467eea4c21a02548a9fb82766f198 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlHead } from './components';
+import GlHead from './components/header.vue';
 
 export default {
   components: {
diff --git a/src/components/index.js b/src/components/index.js
deleted file mode 100644
index 635eb04eeaa8e2065b71df9e6998277a4b24f4b7..0000000000000000000000000000000000000000
--- a/src/components/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import GlListIncident from './list_incident.vue';
-import GlHead from './header.vue';
-import GlMarkdown from './markdown.vue';
-import GlComment from './comment.vue';
-
-export { GlListIncident, GlHead, GlMarkdown, GlComment };
diff --git a/src/views/details.vue b/src/views/details.vue
index a4391d716ea15bc82858f5fbf1c5c0c505cf02e2..b2145cc336c18f11a775851174c0ec1189bbe6aa 100644
--- a/src/views/details.vue
+++ b/src/views/details.vue
@@ -6,7 +6,8 @@ import GlIcon from '@gitlab/ui/dist/components/base/icon/icon';
 import GlBadge from '@gitlab/ui/dist/components/base/badge/badge';
 import GlAlert from '@gitlab/ui/dist/components/base/alert/alert';
 import GlTooltip from '@gitlab/ui/dist/components/base/tooltip/tooltip';
-import { GlMarkdown, GlComment } from '../components';
+import GlComment from '../components/comment.vue';
+import GlMarkdown from '../components/markdown.vue';
 import { dateTimeMixin } from '../utils/datetime';
 
 export default {
diff --git a/src/views/list.vue b/src/views/list.vue
index 7c37c783d48e418ba65ec905c9fe5d37d68173f7..0a9e28097f0abb3061c12e876afdeb20b76b0b8c 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -2,7 +2,7 @@
 import axios from 'axios';
 import GlLoadingIcon from '@gitlab/ui/dist/components/base/loading_icon/loading_icon';
 import GlAlert from '@gitlab/ui/dist/components/base/alert/alert';
-import { GlListIncident } from '../components';
+import GlListIncident from '../components/list_incident.vue';
 
 export default {
   components: {
diff --git a/tests/unit/components/comment_spec.js b/tests/unit/components/comment_spec.js
index 4cd3820142153f0c422ffdafe72242fa0204b3f6..a38fb7a9b920c3fa466cc01adeffaab4d48cec1c 100644
--- a/tests/unit/components/comment_spec.js
+++ b/tests/unit/components/comment_spec.js
@@ -1,7 +1,8 @@
 import { shallowMount } from '@vue/test-utils';
 import * as timeago from 'timeago.js';
 import GlTooltip from '@gitlab/ui/dist/components/base/tooltip/tooltip';
-import { GlComment, GlMarkdown } from '../../../src/components';
+import GlComment from '../../../src/components/comment.vue';
+import GlMarkdown from '../../../src/components/markdown.vue';
 import { dateTimeMixin } from '../../../src/utils/datetime';
 
 jest.mock('../../../src/utils/datetime');
diff --git a/tests/unit/components/header_spec.js b/tests/unit/components/header_spec.js
index f764d7e1d8f1bcbcc58ff5e1afd3b96614437a0e..0b513354a9c58bbe10d40ffded692d45c0ad4f4c 100644
--- a/tests/unit/components/header_spec.js
+++ b/tests/unit/components/header_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import GlLink from '@gitlab/ui/dist/components/base/link/link';
 import GlNavbar from '@gitlab/ui/dist/components/base/navbar/navbar';
-import { GlHead } from '../../../src/components';
+import GlHead from '../../../src/components/header.vue';
 
 describe('Header component', () => {
   let wrapper;
diff --git a/tests/unit/components/list_incident_spec.js b/tests/unit/components/list_incident_spec.js
index 5e3b2dd0d57961dbaa192f4a806f41a16bdcb7ce..817b349311ea588adfdbdba5e3aad55c45577120 100644
--- a/tests/unit/components/list_incident_spec.js
+++ b/tests/unit/components/list_incident_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount, RouterLinkStub } from '@vue/test-utils';
 import GlTooltip from '@gitlab/ui/dist/components/base/tooltip/tooltip';
 import GlBadge from '@gitlab/ui/dist/components/base/badge/badge';
-import { GlListIncident } from '../../../src/components';
+import GlListIncident from '../../../src/components/list_incident.vue';
 import { dateTimeMixin } from '../../../src/utils/datetime';
 
 jest.mock('../../../src/utils/datetime');
diff --git a/tests/unit/components/markdown_spec.js b/tests/unit/components/markdown_spec.js
index f6f4c91023f16a3b27f8019c0994f2fc5d471d16..e32a2b419469dfffa7628328d35b2b70b5671da8 100644
--- a/tests/unit/components/markdown_spec.js
+++ b/tests/unit/components/markdown_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import VueSanitize from 'vue-sanitize';
-import { GlMarkdown } from '../../../src/components';
+import GlMarkdown from '../../../src/components/markdown.vue';
 
 describe('Markdown text', () => {
   let wrapper;
diff --git a/tests/unit/views/details_spec.js b/tests/unit/views/details_spec.js
index 594351afeb2deef8812c5d0a2ecdd7accea40e57..d0db195b77b00d743f07fb5fe3cdad73bbcec6ab 100644
--- a/tests/unit/views/details_spec.js
+++ b/tests/unit/views/details_spec.js
@@ -6,7 +6,8 @@ import GlAlert from '@gitlab/ui/dist/components/base/alert/alert';
 import GlBadge from '@gitlab/ui/dist/components/base/badge/badge';
 import GlTooltip from '@gitlab/ui/dist/components/base/tooltip/tooltip';
 import Details from '../../../src/views/details.vue';
-import { GlMarkdown, GlComment } from '../../../src/components';
+import GlComment from '../../../src/components/comment.vue';
+import GlMarkdown from '../../../src/components/markdown.vue';
 import { dateTimeMixin } from '../../../src/utils/datetime';
 
 jest.mock('axios');
diff --git a/tests/unit/views/list_spec.js b/tests/unit/views/list_spec.js
index 58dc1300da39dea8441bfacdf5022a9e88869243..3209a22a610049c8da95b85341fa5410da180bce 100644
--- a/tests/unit/views/list_spec.js
+++ b/tests/unit/views/list_spec.js
@@ -4,7 +4,7 @@ import GlAlert from '@gitlab/ui/dist/components/base/alert/alert';
 import GlLoadingIcon from '@gitlab/ui/dist/components/base/loading_icon/loading_icon';
 import GlBadge from '@gitlab/ui/dist/components/base/badge/badge';
 import List from '../../../src/views/list.vue';
-import { GlListIncident } from '../../../src/components';
+import GlListIncident from '../../../src/components/list_incident.vue';
 
 jest.mock('axios');
 axios.get.mockResolvedValue({