diff --git a/__tests__/components/DataListToolbar.test.jsx b/__tests__/components/DataListToolbar.test.jsx
index 22b91e6530..be5e028d37 100644
--- a/__tests__/components/DataListToolbar.test.jsx
+++ b/__tests__/components/DataListToolbar.test.jsx
@@ -4,8 +4,6 @@ import DataListToolbar from '../../src/components/DataListToolbar';
 
 describe('<DataListToolbar />', () => {
   const columns = [{ name: 'Name', key: 'name', isSortable: true }];
-  const noop = () => {};
-
   let toolbar;
 
   afterEach(() => {
diff --git a/__tests__/pages/Organizations/Organization.add.test.jsx b/__tests__/pages/Organizations/Organization.add.test.jsx
deleted file mode 100644
index e45b381a7b..0000000000
--- a/__tests__/pages/Organizations/Organization.add.test.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import { API_ORGANIZATIONS } from '../../../src/endpoints';
-import OrganizationAdd from '../../../src/pages/Organizations/Organization.add';
-
-describe('<OrganizationAdd />', () => {
-  let pageWrapper;
-
-  beforeEach(() => {
-    pageWrapper = mount(<OrganizationAdd />);
-  });
-
-  afterEach(() => {
-    pageWrapper.unmount();
-  });
-
-  test('initially renders without crashing', () => {
-    expect(pageWrapper.length).toBe(1);
-  });
-
-  test('API Organization endpoint is valid', () => {
-    expect(API_ORGANIZATIONS).toBeDefined();
-  });
-});
diff --git a/__tests__/pages/Organizations/Organization.view.test.jsx b/__tests__/pages/Organizations/Organization.view.test.jsx
deleted file mode 100644
index a6fccea001..0000000000
--- a/__tests__/pages/Organizations/Organization.view.test.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-import { mount } from 'enzyme';
-import { API_ORGANIZATIONS } from '../../../src/endpoints';
-import OrganizationView from '../../../src/pages/Organizations/Organization.view';
-
-describe('<OrganizationView />', () => {
-  let pageWrapper;
-
-  beforeEach(() => {
-    pageWrapper = mount(
-      <MemoryRouter initialEntries={['/organizations/1']}>
-        <OrganizationView
-          match={{ path: '/organizations/:id', route: 'organizations/1', link: 'organizations', params: { id: '1' } }}
-          location={{ search: '', pathname: '' }}
-        />
-      </MemoryRouter>
-    );
-  });
-
-  afterEach(() => {
-    pageWrapper.unmount();
-  });
-
-  test('initially renders without crashing', () => {
-    expect(pageWrapper.length).toBe(1);
-  });
-
-  test('API Organization endpoint is valid', () => {
-    expect(API_ORGANIZATIONS).toBeDefined();
-  });
-});
diff --git a/__tests__/pages/Organizations/Organizations.list.test.jsx b/__tests__/pages/Organizations/Organizations.list.test.jsx
deleted file mode 100644
index 4162bae9f4..0000000000
--- a/__tests__/pages/Organizations/Organizations.list.test.jsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { HashRouter } from 'react-router-dom';
-
-import { mount } from 'enzyme';
-
-import api from '../../../src/api';
-import { API_ORGANIZATIONS } from '../../../src/endpoints';
-import Organizations from '../../../src/pages/Organizations';
-
-describe('<Organizations />', () => {
-  let pageWrapper;
-
-  const results = [
-    {
-      id: 1,
-      name: 'org 1',
-      summary_fields: {
-        related_field_counts: {
-          users: 1,
-          teams: 1,
-          admins: 1
-        }
-      }
-    },
-    {
-      id: 2,
-      name: 'org 2',
-      summary_fields: {
-        related_field_counts: {
-          users: 1,
-          teams: 1,
-          admins: 1
-        }
-      }
-    },
-    {
-      id: 3,
-      name: 'org 3',
-      summary_fields: {
-        related_field_counts: {
-          users: 1,
-          teams: 1,
-          admins: 1
-        }
-      }
-    },
-  ];
-  const count = results.length;
-  const response = { data: { count, results } };
-
-  beforeEach(() => {
-    api.get = jest.fn().mockImplementation(() => Promise.resolve(response));
-    pageWrapper = mount(<HashRouter><Organizations /></HashRouter>);
-  });
-
-  afterEach(() => {
-    pageWrapper.unmount();
-  });
-
-  test('it renders expected content', () => {
-    const pageSections = pageWrapper.find('PageSection');
-    const title = pageWrapper.find('Title');
-
-    expect(pageWrapper.length).toBe(1);
-    expect(pageSections.length).toBe(2);
-    expect(title.length).toBe(1);
-    expect(title.props().size).toBe('2xl');
-    pageSections.forEach(section => {
-      expect(section.props().variant).toBeDefined();
-    });
-    expect(pageWrapper.find('ul').length).toBe(1);
-    expect(pageWrapper.find('ul li').length).toBe(0);
-    // will render all list items on update
-    pageWrapper.update();
-    expect(pageWrapper.find('ul li').length).toBe(count);
-  });
-
-  test('API Organization endpoint is valid', () => {
-    expect(API_ORGANIZATIONS).toBeDefined();
-  });
-
-  test('it displays a tooltip on delete hover', () => {
-    const tooltip = '.pf-c-tooltip__content';
-    const deleteButton = 'button[aria-label="Delete"]';
-
-    expect(pageWrapper.find(tooltip).length).toBe(0);
-    pageWrapper.find(deleteButton).simulate('mouseover');
-    expect(pageWrapper.find(tooltip).length).toBe(1);
-  });
-});
diff --git a/__tests__/pages/Organizations/components/OrganizationBreadcrumb.test.jsx b/__tests__/pages/Organizations/components/OrganizationBreadcrumb.test.jsx
new file mode 100644
index 0000000000..87066ce32f
--- /dev/null
+++ b/__tests__/pages/Organizations/components/OrganizationBreadcrumb.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationBreadcrumb from '../../../../src/pages/Organizations/components/OrganizationBreadcrumb';
+
+xdescribe('<OrganizationBreadcrumb />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationBreadcrumb />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/components/OrganizationDetail.test.jsx b/__tests__/pages/Organizations/components/OrganizationDetail.test.jsx
new file mode 100644
index 0000000000..2048e5c4d3
--- /dev/null
+++ b/__tests__/pages/Organizations/components/OrganizationDetail.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationDetail from '../../../../src/pages/Organizations/components/OrganizationDetail';
+
+xdescribe('<OrganizationDetail />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationDetail />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/components/OrganizationEdit.test.jsx b/__tests__/pages/Organizations/components/OrganizationEdit.test.jsx
new file mode 100644
index 0000000000..7f6a6a0729
--- /dev/null
+++ b/__tests__/pages/Organizations/components/OrganizationEdit.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationEdit from '../../../../src/pages/Organizations/components/OrganizationEdit';
+
+xdescribe('<OrganizationEdit />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationEdit />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/components/OrganizationListItem.test.jsx b/__tests__/pages/Organizations/components/OrganizationListItem.test.jsx
new file mode 100644
index 0000000000..244604b2dd
--- /dev/null
+++ b/__tests__/pages/Organizations/components/OrganizationListItem.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationListItem from '../../../../src/pages/Organizations/components/OrganizationListItem';
+
+xdescribe('<OrganizationListItem />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationListItem />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/index.test.jsx b/__tests__/pages/Organizations/index.test.jsx
new file mode 100644
index 0000000000..40a8066d49
--- /dev/null
+++ b/__tests__/pages/Organizations/index.test.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { mount } from 'enzyme';
+import Organizations from '../../../src/pages/Organizations/index';
+
+describe('<Organizations />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <MemoryRouter initialEntries={['/organizations']} initialIndex={0}>
+        <Organizations
+          match={{ path: '/organizations', route: '/organizations', link: 'organizations' }}
+          location={{ search: '', pathname: '/organizations' }}
+        />
+      </MemoryRouter>
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/utils.test.jsx b/__tests__/pages/Organizations/utils.test.jsx
new file mode 100644
index 0000000000..4b92cae0c1
--- /dev/null
+++ b/__tests__/pages/Organizations/utils.test.jsx
@@ -0,0 +1,13 @@
+import getTabName from '../../../src/pages/Organizations/utils';
+
+describe('getTabName', () => {
+  test('returns tab name', () => {
+    expect(getTabName('details')).toBe('Details');
+    expect(getTabName('users')).toBe('Users');
+    expect(getTabName('teams')).toBe('Teams');
+    expect(getTabName('admins')).toBe('Admins');
+    expect(getTabName('notifications')).toBe('Notifications');
+    expect(getTabName('unknown')).toBe('');
+    expect(getTabName()).toBe('');
+  });
+});
diff --git a/__tests__/pages/Organizations/views/Organization.add.test.jsx b/__tests__/pages/Organizations/views/Organization.add.test.jsx
new file mode 100644
index 0000000000..5c1290e535
--- /dev/null
+++ b/__tests__/pages/Organizations/views/Organization.add.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationAdd from '../../../../src/pages/Organizations/views/Organization.add';
+
+xdescribe('<OrganizationAdd />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationAdd />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/views/Organization.view.test.jsx b/__tests__/pages/Organizations/views/Organization.view.test.jsx
new file mode 100644
index 0000000000..2f5c65e975
--- /dev/null
+++ b/__tests__/pages/Organizations/views/Organization.view.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationView from '../../../../src/pages/Organizations/views/Organization.view';
+
+xdescribe('<OrganizationView />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationView />
+    );
+  });
+});
diff --git a/__tests__/pages/Organizations/views/Organizations.list.test.jsx b/__tests__/pages/Organizations/views/Organizations.list.test.jsx
new file mode 100644
index 0000000000..2fae7285d0
--- /dev/null
+++ b/__tests__/pages/Organizations/views/Organizations.list.test.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import OrganizationsList from '../../../../src/pages/Organizations/views/Organizations.list';
+
+xdescribe('<OrganizationsList />', () => {
+  test('initially renders succesfully', () => {
+    mount(
+      <OrganizationsList />
+    );
+  });
+});
diff --git a/package.json b/package.json
index a60cb4f397..19dad2c599 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.jsx",
   "scripts": {
     "start": "webpack-dev-server --config ./webpack.config.js --mode development",
-    "test": "jest --watchAll --coverage",
+    "test": "jest --watch --coverage",
     "lint": "./node_modules/eslint/bin/eslint.js src/**/*.js src/**/*.jsx"
   },
   "keywords": [],