diff --git a/__tests__/components/AnsibleSelect.test.jsx b/__tests__/components/AnsibleSelect.test.jsx
index c80207cc9d..d4d933162a 100644
--- a/__tests__/components/AnsibleSelect.test.jsx
+++ b/__tests__/components/AnsibleSelect.test.jsx
@@ -44,6 +44,6 @@ describe('<AnsibleSelect />', () => {
         defaultSelected={mockData[1]}
       />
     );
-    expect(wrapper.find('Select')).toHaveLength(1);
+    expect(wrapper.find('FormSelect')).toHaveLength(1);
   });
 });
diff --git a/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
index c9ea5414b4..1ce8ae0a6e 100644
--- a/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
+++ b/__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
@@ -172,8 +172,8 @@ describe('<OrganizationAdd />', () => {
         </I18nProvider>
       </MemoryRouter>
     ).find('OrganizationAdd').find('AnsibleSelect');
-    expect(wrapper.find('Select')).toHaveLength(1);
-    expect(wrapper.find('SelectOption')).toHaveLength(2);
+    expect(wrapper.find('FormSelect')).toHaveLength(1);
+    expect(wrapper.find('FormSelectOption')).toHaveLength(2);
   });
 
   test('AnsibleSelect component does not render if there are 0 virtual environments', () => {
@@ -189,6 +189,6 @@ describe('<OrganizationAdd />', () => {
         </I18nProvider>
       </MemoryRouter>
     ).find('OrganizationAdd').find('AnsibleSelect');
-    expect(wrapper.find('Select')).toHaveLength(0);
+    expect(wrapper.find('FormSelect')).toHaveLength(0);
   });
 });
diff --git a/src/components/AnsibleSelect/AnsibleSelect.jsx b/src/components/AnsibleSelect/AnsibleSelect.jsx
index 807bd9b73f..2363f090b0 100644
--- a/src/components/AnsibleSelect/AnsibleSelect.jsx
+++ b/src/components/AnsibleSelect/AnsibleSelect.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import {
-  Select,
-  SelectOption,
+  FormSelect,
+  FormSelectOption,
 } from '@patternfly/react-core';
 
 class AnsibleSelect extends React.Component {
@@ -21,11 +21,11 @@ class AnsibleSelect extends React.Component {
   render () {
     const { label, value, data, defaultSelected } = this.props;
     return (
-      <Select value={value} onChange={this.onSelectChange} aria-label="Select Input">
+      <FormSelect value={value} onChange={this.onSelectChange} aria-label="Select Input">
         {data.map((datum) => (datum === defaultSelected
-          ? (<SelectOption key="" value="" label={`Use Default ${label}`} />) : (<SelectOption key={datum} value={datum} label={datum} />)))
+          ? (<FormSelectOption key="" value="" label={`Use Default ${label}`} />) : (<FormSelectOption key={datum} value={datum} label={datum} />)))
         }
-      </Select>
+      </FormSelect>
     );
   }
 }