diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index b36eac392e..af96db06af 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -807,8 +807,8 @@ class RunInventoryUpdate(BaseTask):
             ec2_opts.setdefault('vpc_destination_variable', 'ip_address')
             ec2_opts.setdefault('route53', 'False')
             ec2_opts.setdefault('nested_groups', 'True')
-            ec2_opts['cache_path'] = tempfile.mkdtemp(prefix='awx_ec2_')
-            ec2_opts['cache_max_age'] = '300'
+            ec2_opts.setdefault('cache_path', tempfile.mkdtemp(prefix='awx_ec2_'))
+            ec2_opts.setdefault('cache_max_age', '300')
             for k,v in ec2_opts.items():
                 cp.set(section, k, str(v))
         # Build pyrax creds INI for rax inventory script.
diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py
index 532e5ff1a8..ef4826cf1e 100644
--- a/awx/main/tests/inventory.py
+++ b/awx/main/tests/inventory.py
@@ -6,6 +6,7 @@ import datetime
 import json
 import os
 import re
+import tempfile
 
 # Django
 from django.conf import settings
@@ -1396,9 +1397,11 @@ class InventoryUpdatesTest(BaseTransactionTest):
         group.name = 'ec2'
         group.save()
         self.group = group
+        cache_path = tempfile.mkdtemp(prefix='awx_ec2_')
+        self._temp_paths.append(cache_path)
         inventory_source = self.update_inventory_source(self.group,
             source='ec2', credential=credential, source_regions=source_regions,
-            source_vars='---\n\nnested_groups: false\n')
+            source_vars='---\n\nnested_groups: false\ncache_path: %s\n' % cache_path)
         # Check first without instance_id set (to import by name only).
         with self.settings(EC2_INSTANCE_ID_VAR=''):
             self.check_inventory_source(inventory_source)
@@ -1447,11 +1450,6 @@ class InventoryUpdatesTest(BaseTransactionTest):
             source='ec2', credential=credential, source_regions=source_regions,
             source_vars='---') # nested_groups is true by default.
         self.check_inventory_source(inventory_source)
-        # Manually disable all hosts, verify a new update re-enables them.
-        for host in self.inventory.hosts.all():
-            host.enabled = False
-            host.save()
-        self.check_inventory_source(inventory_source, initial=False)
         # Verify that main group is in top level groups (hasn't been added as
         # its own child).
         self.assertTrue(self.group in self.inventory.root_groups)