diff --git a/firestore-next/test.firestore.js b/firestore-next/test.firestore.js
index 17ff6d29..2469b736 100644
--- a/firestore-next/test.firestore.js
+++ b/firestore-next/test.firestore.js
@@ -1158,6 +1158,27 @@ describe("firestore", () => {
         });
     });
 
+    describe("aggregate queries", () => {
+        it("should fetch the count of documents in a collection", async () => {
+            const { collection, getCountFromServer } = require("firebase/firestore"); 
+            // [START count_aggregate_collection]
+            const coll = collection(db, "cities");
+            const snapshot = await getCountFromServer(coll);
+            console.log('count: ', snapshot.data().count);
+            // [END count_aggregate_collection]
+        });
+
+        it("should fetch the count of documents in a query", async () => {
+            const { collection, getCountFromServer, where, query } = require("firebase/firestore"); 
+            // [START count_aggregate_query]
+            const coll = collection(db, "cities");
+            const q = query(coll, where("state", "==", "CA"));
+            const snapshot = await getCountFromServer(q);
+            console.log('count: ', snapshot.data().count);
+            // [END count_aggregate_query]
+        });
+    });
+
     // TODO: Break out into separate file
     describe("solution-aggregation", () => {
         it("should update a restaurant in a transaction #UNVERIFIED", async () => {
diff --git a/snippets/firestore-next/test-firestore/count_aggregate_collection.js b/snippets/firestore-next/test-firestore/count_aggregate_collection.js
new file mode 100644
index 00000000..7dca7e37
--- /dev/null
+++ b/snippets/firestore-next/test-firestore/count_aggregate_collection.js
@@ -0,0 +1,11 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START count_aggregate_collection_modular]
+const coll = collection(db, "cities");
+const snapshot = await getCountFromServer(coll);
+console.log('count: ', snapshot.data().count);
+// [END count_aggregate_collection_modular]
\ No newline at end of file
diff --git a/snippets/firestore-next/test-firestore/count_aggregate_query.js b/snippets/firestore-next/test-firestore/count_aggregate_query.js
new file mode 100644
index 00000000..37a27458
--- /dev/null
+++ b/snippets/firestore-next/test-firestore/count_aggregate_query.js
@@ -0,0 +1,12 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START count_aggregate_query_modular]
+const coll = collection(db, "cities");
+const q = query(coll, where("state", "==", "CA"));
+const snapshot = await getCountFromServer(q);
+console.log('count: ', snapshot.data().count);
+// [END count_aggregate_query_modular]
\ No newline at end of file