diff --git a/cgpt/cgpt_common.c b/cgpt/cgpt_common.c
index 193f2e1..8def05e 100644
--- a/cgpt/cgpt_common.c
+++ b/cgpt/cgpt_common.c
@@ -269,6 +269,11 @@
     }
   }
 
+  // Sync early! Only sync file descriptor here, and leave the whole system sync
+  // outside cgpt because whole system sync would trigger tons of disk accesses
+  // and timeout tests.
+  fsync(drive->fd);
+
   close(drive->fd);
 
   if (drive->gpt.primary_header)