diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 5a4d78e..3b05ac4 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -197,6 +197,8 @@
     In this case we chose to guess by filename, but we could also parse the
     xml files in the module. (Maybe this needs to be done in the future.)
     """
+    if CONFIG.get('DYNAMIC_TEST_FETCH'):
+        return None
     if filename.endswith('arm.zip'):
         return 'arm'
     if filename.endswith('arm64.zip'):
@@ -227,9 +229,9 @@
                     abi part is omitted.
     """
     ext_parts = []
-    if not is_public:
+    if not CONFIG.get('DYNAMIC_TEST_FETCH') and not is_public:
         ext_parts = [revision]
-    if abi:
+    if not CONFIG.get('DYNAMIC_TEST_FETCH') and abi:
         ext_parts += [abi]
     ext_parts += [module]
     if led_provision: