diff --git a/src/test/testdisk.c b/src/test/testdisk.c
index a062878e..cce4bd9d 100644
--- a/src/test/testdisk.c
+++ b/src/test/testdisk.c
@@ -38,8 +38,13 @@ static void testdisk_teardown(void *arg) {
 // ----------------------------------------------------------------------------
 // Disk TESTS ...
 
+#if CONFORMANT_TRACKS
 #define EXPECTED_DISK_TRACE_FILE_SIZE 141350
 #define EXPECTED_DISK_TRACE_SHA "471EB3D01917B1C6EF9F13C5C7BC1ACE4E74C851"
+#else
+#define EXPECTED_DISK_TRACE_FILE_SIZE 133274
+#define EXPECTED_DISK_TRACE_SHA "A496A99DA28170FF08C5B9E5A309D7E7CDF5D33E"
+#endif
 TEST test_boot_disk_bytes() {
     srandom(0);
 
@@ -133,8 +138,13 @@ TEST test_boot_disk_bytes_nib() {
     PASS();
 }
 
+#if CONFORMANT_TRACKS
 #define EXPECTED_DISK_TRACE_PO_FILE_SIZE 141350
 #define EXPECTED_DISK_TRACE_PO_SHA "6C2170D3AA82F87DD34E177309808199BDCCB018"
+#else
+#define EXPECTED_DISK_TRACE_PO_FILE_SIZE 133274
+#define EXPECTED_DISK_TRACE_PO_SHA "EDCCA335D6A797BFCCA1595F3990A035A6C303EF"
+#endif
 TEST test_boot_disk_bytes_po() {
     test_setup_boot_disk(BLANK_PO, 0);
     srandom(0);
@@ -312,8 +322,13 @@ TEST test_savehello_po() {
     PASS();
 }
 
+#if CONFORMANT_TRACKS
 #define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 63675
 #define EXPECTED_DISKWRITE_TRACE_DSK_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
+#else
+#define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 63676 // orly?
+#define EXPECTED_DISKWRITE_TRACE_DSK_SHA "0277B80A9B3DA4CE75CAB121985548474C67A55C"
+#endif
 TEST test_disk_bytes_savehello_dsk() {
     test_setup_boot_disk(BLANK_DSK, 0);
     BOOT_TO_DOS();
@@ -442,8 +457,13 @@ TEST test_disk_bytes_savehello_nib() {
     PASS();
 }
 
+#if CONFORMANT_TRACKS
 #define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE 63675
 #define EXPECTED_DISKWRITE_TRACE_PO_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
+#else
+#define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE 63676 // orly?
+#define EXPECTED_DISKWRITE_TRACE_PO_SHA "0277B80A9B3DA4CE75CAB121985548474C67A55C"
+#endif
 TEST test_disk_bytes_savehello_po() {
     test_setup_boot_disk(BLANK_PO, 0);
     BOOT_TO_DOS();