diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py
index 8983e761c2..0204a8997e 100644
--- a/dvc/remote/gdrive.py
+++ b/dvc/remote/gdrive.py
@@ -537,8 +537,9 @@ def walk_files(self, path_info, **kwargs):
         if path_info == self.path_info:
             prefix = None
         else:
-            prefix = path_info.relative_to(self.path_info).path
-        return self._list_paths(prefix=prefix, **kwargs)
+            prefix = path_info.path
+        for fname in self._list_paths(prefix=prefix, **kwargs):
+            yield path_info.replace(fname)
 
     def remove(self, path_info):
         item_id = self._get_item_id(path_info)
diff --git a/tests/remotes.py b/tests/remotes.py
index 1a3c66b334..a5ce43a30a 100644
--- a/tests/remotes.py
+++ b/tests/remotes.py
@@ -150,7 +150,7 @@ def create_dir(dvc, url):
             "gdrive_use_service_account": True,
         }
         remote = GDriveRemote(dvc, config)
-        remote._gdrive_create_dir("root", remote.path_info.path)
+        remote.tree._gdrive_create_dir("root", remote.path_info.path)
 
     @staticmethod
     def get_url():