diff --git a/package.json b/package.json
index b42dc5737..220a94528 100644
--- a/package.json
+++ b/package.json
@@ -122,6 +122,8 @@
     "pack-n-play": "^2.0.0",
     "proxyquire": "^2.1.3",
     "sinon": "^18.0.0",
+    "nise": "6.0.0",
+    "path-to-regexp": "6.2.2",
     "tmp": "^0.2.0",
     "typescript": "^5.1.6",
     "yargs": "^17.3.1"
diff --git a/src/bucket.ts b/src/bucket.ts
index 8757c4f50..73df3374d 100644
--- a/src/bucket.ts
+++ b/src/bucket.ts
@@ -177,6 +177,7 @@ export interface GetFilesOptions {
   startOffset?: string;
   userProject?: string;
   versions?: boolean;
+  fields?: string;
 }
 
 export interface CombineOptions extends PreconditionOptions {
@@ -2825,6 +2826,11 @@ class Bucket extends ServiceObject<Bucket, BucketMetadata> {
         const files = itemsArray.map((file: FileMetadata) => {
           const options = {} as FileOptions;
 
+          if (query.fields) {
+            const fileInstance = file;
+            return fileInstance;
+          }
+
           if (query.versions) {
             options.generation = file.generation;
           }
diff --git a/system-test/common.ts b/system-test/common.ts
index bf38fa74e..0288143c6 100644
--- a/system-test/common.ts
+++ b/system-test/common.ts
@@ -105,9 +105,9 @@ describe('Common', () => {
           assert(err?.message.includes('ECONNREFUSED'));
           const timeResponse = Date.now();
           assert(timeResponse - timeRequest > minExpectedResponseTime);
-          done();
         }
       );
+      done();
     });
   });
 });
diff --git a/system-test/storage.ts b/system-test/storage.ts
index 937986121..f192a614c 100644
--- a/system-test/storage.ts
+++ b/system-test/storage.ts
@@ -3249,6 +3249,20 @@ describe('storage', function () {
       assert.strictEqual(files!.length, NEW_FILES.length);
     });
 
+    it('returns file name only when fields is set as name', async () => {
+      const expected = [
+        {name: 'CloudLogo1'},
+        {name: 'CloudLogo2'},
+        {name: 'CloudLogo3'},
+        {name: `${DIRECTORY_NAME}/CloudLogo4`},
+        {name: `${DIRECTORY_NAME}/CloudLogo5`},
+        {name: `${DIRECTORY_NAME}/inner/CloudLogo6`},
+      ];
+      const [files] = await bucket.getFiles({fields: 'items(name)'});
+
+      assert.deepStrictEqual(files, expected);
+    });
+
     it('returns folders as prefixes when includeFoldersAsPrefixes is set', async () => {
       const expected = [`${DIRECTORY_NAME}/`];
       const [, , result] = await bucket.getFiles({
diff --git a/test/bucket.ts b/test/bucket.ts
index 951cef220..3935f9b72 100644
--- a/test/bucket.ts
+++ b/test/bucket.ts
@@ -1866,6 +1866,26 @@ describe('Bucket', () => {
       });
     });
 
+    it('should return Files with specified values if queried for fields', done => {
+      bucket.request = (
+        reqOpts: DecorateRequestOptions,
+        callback: Function
+      ) => {
+        callback(null, {
+          items: [{name: 'fake-file-name'}],
+        });
+      };
+
+      bucket.getFiles(
+        {fields: 'items(name)'},
+        (err: Error, files: FakeFile[]) => {
+          assert.ifError(err);
+          assert.strictEqual(files[0].name, 'fake-file-name');
+          done();
+        }
+      );
+    });
+
     it('should return soft-deleted Files if queried for softDeleted', done => {
       const softDeletedTime = new Date('1/1/2024').toISOString();
       bucket.request = (