diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1391239..4dbfdc90 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -333,7 +333,7 @@ jobs:
              $gam print browsers
              export sn="$JID$JID$JID$JID-$(openssl rand -base64 32 | sed 's/[^a-zA-Z0-9]//g')"
              $gam create device serialnumber $sn devicetype android
-             $gam print cros allfields nolists
+             $gam print cros allfields nolists sortby serialnumber
              $gam report usageparameters customer
              $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins
              $gam report customer todrive
diff --git a/src/gam/display.py b/src/gam/display.py
index b5026f12..aa845274 100644
--- a/src/gam/display.py
+++ b/src/gam/display.py
@@ -231,7 +231,9 @@ def write_csv_file(csvRows, titles, list_type, todrive):
                 'No columns selected with GAM_CSV_HEADER_FILTER and GAM_CSV_HEADER_DROP_FILTER\n'
             )
             return
-    csv.register_dialect('nixstdout', lineterminator='\n')
+    csv.register_dialect('nixstdout',
+                         lineterminator='\n',
+                         quoting=csv.QUOTE_MINIMAL)
     if todrive:
         write_to = io.StringIO()
     else:
@@ -239,8 +241,7 @@ def write_csv_file(csvRows, titles, list_type, todrive):
     writer = csv.DictWriter(write_to,
                             fieldnames=titles,
                             dialect='nixstdout',
-                            extrasaction='ignore',
-                            quoting=csv.QUOTE_MINIMAL)
+                            extrasaction='ignore')
     try:
         writer.writerow(dict((item, item) for item in writer.fieldnames))
         writer.writerows(csvRows)