diff --git a/testing/scripts/diff-remove-x509-names b/testing/scripts/diff-remove-x509-names
index d9437b0741..2bd7787611 100755
--- a/testing/scripts/diff-remove-x509-names
+++ b/testing/scripts/diff-remove-x509-names
@@ -5,27 +5,28 @@
 
 BEGIN { FS="\t"; OFS="\t"; s_col = -1; i_col = -1; is_col = -1; cs_col = -1; ci_col = -1; cert_subj_col = -1; cert_issuer_col = -1 }
 
-/^#fields/ {
-    for ( i = 2; i < NF; ++i )
-        {
-        if ( $i == "subject" )
-            s_col = i-1;
-        if ( $i == "issuer" )
-            i_col = i-1;
-        if ( $i == "issuer_subject" )
-            is_col = i-1;
-        if ( $i == "client_subject" )
-            cs_col = i-1;
-        if ( $i == "client_issuer" )
-            ci_col = i-1;
-        if ( $i == "certificate.subject" )
-            cert_subj_col = i-1;
-        if ( $i == "certificate.issuer" )
-            cert_issuer_col = i-1;
-        }
-}
-
 /^#/ {
+    if ( $1 == "#fields" )
+        {
+        for ( i = 2; i <= NF; ++i )
+            {
+            if ( $i == "subject" )
+                s_col = i-1;
+            if ( $i == "issuer" )
+                i_col = i-1;
+            if ( $i == "issuer_subject" )
+                is_col = i-1;
+            if ( $i == "client_subject" )
+                cs_col = i-1;
+            if ( $i == "client_issuer" )
+                ci_col = i-1;
+            if ( $i == "certificate.subject" )
+                cert_subj_col = i-1;
+            if ( $i == "certificate.issuer" )
+                cert_issuer_col = i-1;
+            }
+        }
+
     print;
     next;
 }