diff --git a/__tests__/.eslintrc b/__tests__/.eslintrc
new file mode 100644
index 0000000000..6d45c889cf
--- /dev/null
+++ b/__tests__/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "react/jsx-pascal-case": "ignore"
+  }
+}
diff --git a/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
index f67dc8780d..3351dd8095 100644
--- a/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
-import OrganizationEdit, { OrganizationEditNoRouter } from '../../../../../src/pages/Organizations/screens/Organization/OrganizationEdit';
+import OrganizationEdit, { _OrganizationEdit } from '../../../../../src/pages/Organizations/screens/Organization/OrganizationEdit';
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -94,7 +94,7 @@ describe('<OrganizationEdit />', () => {
     const wrapper = mount(
       <MemoryRouter>
         <I18nProvider>
-          <OrganizationEditNoRouter
+          <_OrganizationEdit
             history={history}
             organization={mockData}
             api={api}
diff --git a/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
index 95eb5d631c..607ae9acd9 100644
--- a/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
+++ b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
@@ -3,7 +3,7 @@ import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
 import { ConfigContext } from '../../../../src/context';
-import OrganizationAdd, { OrganizationAddNoRouter } from '../../../../src/pages/Organizations/screens/OrganizationAdd';
+import OrganizationAdd, { _OrganizationAdd } from '../../../../src/pages/Organizations/screens/OrganizationAdd';
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -47,7 +47,7 @@ describe('<OrganizationAdd />', () => {
     const wrapper = mount(
       <MemoryRouter>
         <I18nProvider>
-          <OrganizationAddNoRouter
+          <_OrganizationAdd
             history={history}
             api={api}
           />
@@ -68,7 +68,7 @@ describe('<OrganizationAdd />', () => {
     const wrapper = mount(
       <MemoryRouter>
         <I18nProvider>
-          <OrganizationAddNoRouter
+          <_OrganizationAdd
             history={history}
             api={api}
           />
@@ -103,7 +103,7 @@ describe('<OrganizationAdd />', () => {
     const wrapper = mount(
       <MemoryRouter>
         <I18nProvider>
-          <OrganizationAddNoRouter
+          <_OrganizationAdd
             history={history}
             api={api}
           />
diff --git a/src/components/FormRow.jsx b/src/components/FormRow.jsx
new file mode 100644
index 0000000000..d7e6c0cd11
--- /dev/null
+++ b/src/components/FormRow.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+export default function FormRow ({ children }) {
+  return (
+    <div
+      style={{
+        display: 'grid',
+        gridGap: '20px',
+        gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))'
+      }}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/src/pages/Organizations/components/OrganizationForm.jsx b/src/pages/Organizations/components/OrganizationForm.jsx
index a197982e43..eb3bfe005c 100644
--- a/src/pages/Organizations/components/OrganizationForm.jsx
+++ b/src/pages/Organizations/components/OrganizationForm.jsx
@@ -10,6 +10,7 @@ import {
 } from '@patternfly/react-core';
 
 import { ConfigContext } from '../../../context';
+import FormRow from '../../../components/FormRow';
 import FormField from '../../../components/FormField';
 import FormActionGroup from '../../../components/FormActionGroup';
 import AnsibleSelect from '../../../components/AnsibleSelect';
@@ -96,13 +97,7 @@ class OrganizationForm extends Component {
             onSubmit={this.handleSubmit}
             render={formik => (
               <Form autoComplete="off" onSubmit={formik.handleSubmit}>
-                <div
-                  style={{
-                    display: 'grid',
-                    gridGap: '20px',
-                    gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))'
-                  }}
-                >
+                <FormRow>
                   <FormField
                     id="edit-org-form-name"
                     name="name"
@@ -139,7 +134,7 @@ class OrganizationForm extends Component {
                       )
                     )}
                   </ConfigContext.Consumer>
-                </div>
+                </FormRow>
                 <InstanceGroupsLookup
                   api={api}
                   value={instanceGroups}
diff --git a/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
index 0ff0509da7..74b30d3f5e 100644
--- a/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
+++ b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
@@ -84,5 +84,5 @@ OrganizationEdit.contextTypes = {
   custom_virtualenvs: PropTypes.arrayOf(PropTypes.string)
 };
 
-export { OrganizationEdit as OrganizationEditNoRouter };
+export { OrganizationEdit as _OrganizationEdit };
 export default withRouter(OrganizationEdit);
diff --git a/src/pages/Organizations/screens/OrganizationAdd.jsx b/src/pages/Organizations/screens/OrganizationAdd.jsx
index b750f028bc..e02a287972 100644
--- a/src/pages/Organizations/screens/OrganizationAdd.jsx
+++ b/src/pages/Organizations/screens/OrganizationAdd.jsx
@@ -104,5 +104,5 @@ OrganizationAdd.contextTypes = {
   custom_virtualenvs: PropTypes.arrayOf(PropTypes.string)
 };
 
-export { OrganizationAdd as OrganizationAddNoRouter };
+export { OrganizationAdd as _OrganizationAdd };
 export default withRouter(OrganizationAdd);