diff --git a/gclient.py b/gclient.py
index 915a5cc69..c613f863f 100755
--- a/gclient.py
+++ b/gclient.py
@@ -2650,7 +2650,7 @@ class GcsDependency(Dependency):
         # Directory of the extracted tarfile contents
         output_dir = os.path.join(root_dir, self.name.split(':')[0])
         output_file = os.path.join(output_dir, self.output_file
-                                   or gcs_file_name)
+                                   or f'.{gcs_file_name}')
 
         # Remove any forward slashes and drop any extensions
         file_prefix = self.object_name.replace('/', '_').split('.')[0]
diff --git a/tests/gclient_gcs_smoketest.py b/tests/gclient_gcs_smoketest.py
index 17dedc3fe..570e54991 100644
--- a/tests/gclient_gcs_smoketest.py
+++ b/tests/gclient_gcs_smoketest.py
@@ -35,12 +35,8 @@ class GClientSmokeGcs(gclient_smoketest_base.GClientSmokeBase):
 
         tree = self.mangle_git_tree(('repo_22@1', 'src'))
         tree.update({
-            'src/another_gcs_dep/llvmfile.tar.gz':
-            'tarfile',
             'src/another_gcs_dep/extracted_dir/extracted_file':
             'extracted text',
-            'src/gcs_dep/deadbeef':
-            'tarfile',
             'src/gcs_dep/extracted_dir/extracted_file':
             'extracted text',
             'src/gcs_dep_with_output_file/clang-format-no-extract':