diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py
index 8f6f6a6f22..c1b84401a5 100644
--- a/awx/main/tests/functional/api/test_inventory.py
+++ b/awx/main/tests/functional/api/test_inventory.py
@@ -204,22 +204,6 @@ def test_delete_inventory_group(delete, group, alice, role_field, expected_statu
     delete(reverse('api:group_detail', kwargs={'pk': group.id}), alice, expect=expected_status_code)
 
 
-@pytest.mark.django_db
-def test_create_inventory_smarthost(post, get, inventory, admin_user, organization):
-    data = { 'name': 'Host 1', 'description': 'Test Host'}
-    smart_inventory = Inventory(name='smart',
-                                kind='smart',
-                                organization=organization,
-                                host_filter='inventory_sources__source=ec2')
-    smart_inventory.save()
-    post(reverse('api:inventory_hosts_list', kwargs={'pk': smart_inventory.id}), data, admin_user)
-    resp = get(reverse('api:inventory_hosts_list', kwargs={'pk': smart_inventory.id}), admin_user)
-    jdata = json.loads(resp.content)
-
-    assert getattr(smart_inventory, 'kind') == 'smart'
-    assert jdata['count'] == 0
-
-
 @pytest.mark.django_db
 def test_create_inventory_smartgroup(post, get, inventory, admin_user, organization):
     data = { 'name': 'Group 1', 'description': 'Test Group'}
diff --git a/awx/main/tests/functional/api/test_script_endpoint.py b/awx/main/tests/functional/api/test_script_endpoint.py
index eadf1868da..4423d2347f 100644
--- a/awx/main/tests/functional/api/test_script_endpoint.py
+++ b/awx/main/tests/functional/api/test_script_endpoint.py
@@ -7,35 +7,21 @@ from awx.main.models import Inventory, Host
 
 @pytest.mark.django_db
 def test_empty_inventory(post, get, admin_user, organization, group_factory):
-    inventory = Inventory(name='basic_inventory', 
-                          kind='', 
+    inventory = Inventory(name='basic_inventory',
+                          kind='',
                           organization=organization)
     inventory.save()
     resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': inventory.pk}), admin_user)
     jdata = json.loads(resp.content)
-    
+
     assert inventory.hosts.count() == 0
     assert jdata == {}
-    
-    
-@pytest.mark.django_db
-def test_empty_smart_inventory(post, get, admin_user, organization, group_factory):
-    smart_inventory = Inventory(name='smart',
-                                kind='smart',
-                                organization=organization,
-                                host_filter='enabled=True')
-    smart_inventory.save()
-    resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': smart_inventory.pk}), admin_user)
-    smartjdata = json.loads(resp.content)
 
-    assert smart_inventory.hosts.count() == 0
-    assert smartjdata == {}
-    
-    
+
 @pytest.mark.django_db
 def test_ungrouped_hosts(post, get, admin_user, organization, group_factory):
-    inventory = Inventory(name='basic_inventory', 
-                          kind='', 
+    inventory = Inventory(name='basic_inventory',
+                          kind='',
                           organization=organization)
     inventory.save()
     Host.objects.create(name='first_host', inventory=inventory)
@@ -44,32 +30,3 @@ def test_ungrouped_hosts(post, get, admin_user, organization, group_factory):
     jdata = json.loads(resp.content)
     assert inventory.hosts.count() == 2
     assert len(jdata['all']['hosts']) == 2
-
-
-@pytest.mark.django_db
-def test_grouped_hosts_smart_inventory(post, get, admin_user, organization, group_factory):
-    inventory = Inventory(name='basic_inventory', 
-                          kind='', 
-                          organization=organization)
-    inventory.save()
-    groupA = group_factory('test_groupA')
-    host1 = Host.objects.create(name='first_host', inventory=inventory)
-    host2 = Host.objects.create(name='second_host', inventory=inventory)
-    Host.objects.create(name='third_host', inventory=inventory)
-    groupA.hosts.add(host1)
-    groupA.hosts.add(host2)       
-    smart_inventory = Inventory(name='smart_inventory',
-                                kind='smart',
-                                organization=organization,
-                                host_filter='enabled=True')
-    smart_inventory.save()
-    resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': inventory.pk}), admin_user)
-    jdata = json.loads(resp.content)
-    resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': smart_inventory.pk}), admin_user)
-    smartjdata = json.loads(resp.content)
-
-    assert getattr(smart_inventory, 'kind') == 'smart'
-    assert inventory.hosts.count() == 3
-    assert len(jdata['all']['hosts']) == 1
-    assert smart_inventory.hosts.count() == 3
-    assert len(smartjdata['all']['hosts']) == 3
diff --git a/awx/main/tests/functional/models/test_inventory.py b/awx/main/tests/functional/models/test_inventory.py
index fd31e50315..fde2723dc3 100644
--- a/awx/main/tests/functional/models/test_inventory.py
+++ b/awx/main/tests/functional/models/test_inventory.py
@@ -104,40 +104,8 @@ def setup_inventory_groups(inventory, group_factory):
 
 @pytest.mark.django_db
 class TestHostManager:
-    def test_host_filter_change(self, setup_ec2_gce, organization):
-        smart_inventory = Inventory(name='smart',
-                                    kind='smart',
-                                    organization=organization,
-                                    host_filter='inventory_sources__source=ec2')
-        smart_inventory.save()
-        assert len(smart_inventory.hosts.all()) == 2
-
-        smart_inventory.host_filter = 'inventory_sources__source=gce'
-        smart_inventory.save()
-        assert len(smart_inventory.hosts.all()) == 1
-
     def test_host_filter_not_smart(self, setup_ec2_gce, organization):
         smart_inventory = Inventory(name='smart',
                                     organization=organization,
                                     host_filter='inventory_sources__source=ec2')
         assert len(smart_inventory.hosts.all()) == 0
-
-    def test_host_objects_manager(self, setup_ec2_gce, organization):
-        smart_inventory = Inventory(kind='smart',
-                                    name='smart',
-                                    organization=organization,
-                                    host_filter='inventory_sources__source=ec2')
-        smart_inventory.save()
-
-        hosts = smart_inventory.hosts.all()
-        assert len(hosts) == 2
-        assert hosts[0].inventory_sources.first().source == 'ec2'
-        assert hosts[1].inventory_sources.first().source == 'ec2'
-
-    def test_host_objects_no_dupes(self, setup_inventory_groups, organization):
-        smart_inventory = Inventory(name='smart',
-                                    kind='smart',
-                                    organization=organization,
-                                    host_filter='groups__name=test_groupA or groups__name=test_groupB')
-        smart_inventory.save()
-        assert len(smart_inventory.hosts.all()) == 1