diff --git a/lib/datastore/query.js b/lib/datastore/query.js
index ef5947e17af..01230d31484 100644
--- a/lib/datastore/query.js
+++ b/lib/datastore/query.js
@@ -61,8 +61,9 @@ Query.prototype.order = function(order) {
 };
 
 Query.prototype.groupBy = function(fieldNames) {
+  var fields = util.arrayize(fieldNames);
   var q = util.extend(this, new Query());
-  q.groupByVal = fieldNames;
+  q.groupByVal = fields;
   return q;
 };