diff --git a/tests/fc_script/make-machdep.t/run.t b/tests/fc_script/make-machdep.t/run.t
index 917e6c88d2ef9ccb4e6ea22f3b2fc30f66c575c7..8250b8f744f36ef72cdb21189ba18ceaa4e4829f 100644
--- a/tests/fc_script/make-machdep.t/run.t
+++ b/tests/fc_script/make-machdep.t/run.t
@@ -17,6 +17,9 @@
     - --target=x86_64
   eof: (-1)
   errno:
+    edom: '33'
+    eilseq: '84'
+    erange: '34'
     e2big: '7'
     eacces: '13'
     eaddrinuse: '98'
@@ -42,7 +45,6 @@
     edeadlk: '35'
     edeadlock: '35'
     edestaddrreq: '89'
-    edom: '33'
     edquot: '122'
     eexist: '17'
     efault: '14'
@@ -50,7 +52,6 @@
     ehostdown: '112'
     ehostunreach: '113'
     eidrm: '43'
-    eilseq: '84'
     einprogress: '115'
     eintr: '4'
     einval: '22'
@@ -67,9 +68,9 @@
     el3rst: '47'
     elibacc: '79'
     elibbad: '80'
-    elibexec: '83'
     elibmax: '82'
     elibscn: '81'
+    elibexec: '83'
     eloop: '40'
     emediumtype: '124'
     emfile: '24'
@@ -118,15 +119,14 @@
     eproto: '71'
     eprotonosupport: '93'
     eprototype: '91'
-    erange: '34'
     eremchg: '78'
     eremote: '66'
     eremoteio: '121'
     erestart: '85'
     erofs: '30'
     eshutdown: '108'
-    esocktnosupport: '94'
     espipe: '29'
+    esocktnosupport: '94'
     esrch: '3'
     estale: '116'
     estrpipe: '86'
@@ -143,10 +143,10 @@
   fopen_max: '16'
   has__builtin_va_list: true
   host_name_max: '64'
+  int_fast8_t: signed char
   int_fast16_t: long
   int_fast32_t: long
   int_fast64_t: long
-  int_fast8_t: signed char
   intptr_t: long
   l_tmpnam: '20'
   little_endian: true
@@ -173,10 +173,10 @@
   time_t: long
   tmp_max: '238328'
   tty_name_max: '32'
+  uint_fast8_t: unsigned char
   uint_fast16_t: unsigned long
   uint_fast32_t: unsigned long
   uint_fast64_t: unsigned long
-  uint_fast8_t: unsigned char
   uintptr_t: unsigned long
   wchar_t: int
   weof: (0xffffffffu)
diff --git a/tests/misc/custom_machdep.yaml b/tests/misc/custom_machdep.yaml
index b7c9a0b07c9959a69a91f1bfb8a09b8decea31c6..eab2fe4d8c98ca55dce21b0d33f8400a38f90925 100644
--- a/tests/misc/custom_machdep.yaml
+++ b/tests/misc/custom_machdep.yaml
@@ -81,5 +81,5 @@ errno:
   enomem: "47"
   enotsup: "48"
 machdep_name: custom_machdep
-custom_defs: |
-  #define CUSTOM_MACHDEP 1
+custom_defs:
+  CUSTOM_MACHDEP: '1'
diff --git a/tests/misc/oracle/print_machdep.res.oracle b/tests/misc/oracle/print_machdep.res.oracle
index b1566c66852eb15e98254fa0cfbaaf4a89ee1885..9bfb7d917cdacb08ddab3f387a25379215be9d63 100644
--- a/tests/misc/oracle/print_machdep.res.oracle
+++ b/tests/misc/oracle/print_machdep.res.oracle
@@ -1,4 +1,4 @@
-Machine: gcc (GCC) 13.1.1 20230429
+Machine: gcc (GCC) 13.2.1 20230801
    sizeof       short =  2 (16 bits, aligned on 16 bits)
    sizeof         int =  4 (32 bits, aligned on 32 bits)
    sizeof        long =  8 (64 bits, aligned on 64 bits)
diff --git a/tests/syntax/machdep_char_unsigned.yaml b/tests/syntax/machdep_char_unsigned.yaml
index cb4fbd6b6c6a360e076860b4e71b5794c463e17b..99522b793cd6420f70157a277bbe0857ecba5f09 100644
--- a/tests/syntax/machdep_char_unsigned.yaml
+++ b/tests/syntax/machdep_char_unsigned.yaml
@@ -180,4 +180,4 @@ errno:
     exdev: '18'
     exfull: '54'
 machdep_name: 'machdep_char_unsigned'
-custom_defs: ''
+custom_defs: { }