diff --git a/bin/checkapi b/bin/checkapi
index 7447b265ce..5a6251afd0 100755
--- a/bin/checkapi
+++ b/bin/checkapi
@@ -22,7 +22,7 @@ while (<>) {
   # Disregard the following hits
   next if /^H5/;
   next if /^\#/;
-  next if /FUNC_ENTER/;
+  next if /FUNC_ENTER(_NOINIT)*/;
 
   next unless /(H5[A-Z]{1,2}[a-z]\w*)/;
   print "$ARGV:$.: $1\n";
diff --git a/bin/trace b/bin/trace
index af6adb26dc..c2b5534466 100755
--- a/bin/trace
+++ b/bin/trace
@@ -215,7 +215,7 @@ sub rewrite_func ($$$$$) {
     }
   } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
     # Replaced an H5TRACE macro
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\s*\(.*?\);)\n/"$1$2$trace"/es) {
+  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER(_NOINIT)*\s*\(.*?\);)\n/"$1$2$trace"/es) {
     # Added an H5TRACE macro after a FUNC_ENTER macro.
   } else {
     errmesg $file, $name, "unable to insert tracing information";