diff --git a/gclient_scm.py b/gclient_scm.py
index 6a75af567..24c4bee92 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -1542,7 +1542,10 @@ class CipdRoot(object):
   @contextlib.contextmanager
   def _create_ensure_file(self):
     try:
-      contents = '$ParanoidMode CheckPresence\n\n'
+      contents = '$ParanoidMode CheckPresence\n'
+      # TODO(crbug/1329641): Remove once cipd packages have been updated
+      # to always be created in copy mode.
+      contents += '$OverrideInstallMode copy\n\n'
       for subdir, packages in sorted(self._packages_by_subdir.items()):
         contents += '@Subdir %s\n' % subdir
         for package in sorted(packages, key=lambda p: p.name):
diff --git a/tests/gclient_cipd_smoketest.py b/tests/gclient_cipd_smoketest.py
index 0d98b5038..289023fc3 100644
--- a/tests/gclient_cipd_smoketest.py
+++ b/tests/gclient_cipd_smoketest.py
@@ -35,6 +35,7 @@ class GClientSmokeCipd(gclient_smoketest_base.GClientSmokeBase):
     tree.update({
         '_cipd': '\n'.join([
             '$ParanoidMode CheckPresence',
+            '$OverrideInstallMode copy',
             '',
             '@Subdir src/another_cipd_dep',
             'package1 1.1-cr0',
@@ -77,6 +78,7 @@ class GClientSmokeCipd(gclient_smoketest_base.GClientSmokeBase):
     tree.update({
         '_cipd': '\n'.join([
             '$ParanoidMode CheckPresence',
+            '$OverrideInstallMode copy',
             '',
             '@Subdir src/repo12',
             'foo 1.3',
@@ -99,6 +101,7 @@ class GClientSmokeCipd(gclient_smoketest_base.GClientSmokeBase):
     tree.update({
         '_cipd': '\n'.join([
             '$ParanoidMode CheckPresence',
+            '$OverrideInstallMode copy',
             '',
             '@Subdir src/repo12',
             'foo 1.3',
@@ -118,6 +121,7 @@ class GClientSmokeCipd(gclient_smoketest_base.GClientSmokeBase):
     tree.update({
         '_cipd': '\n'.join([
             '$ParanoidMode CheckPresence',
+            '$OverrideInstallMode copy',
             '',
             '@Subdir src/repo12',
             'foo 1.3',