diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index 5b6a9de5c10..f8f3706a4e7 100644
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -146,12 +146,12 @@ EOF
 # Parse option
 #   None
 
-# Print a line-line message left justified in a field of 73 characters
+# Print a line-line message left justified in a field of 83 characters
 # beginning with the word "Testing".
 #
 TESTING() {
    SPACES="                                                               "
-   echo "Testing $* $SPACES" | cut -c1-73 | tr -d '\012'
+   echo "Testing $* $SPACES" | cut -c1-83 | tr -d '\012'
 }
 
 
@@ -224,7 +224,12 @@ TOOLTEST $appmain_o $applib
 
 #  HDF5 program that depends on input args.
 echo "***"Simple Compile and Link in one step with user-supplied arguments.
-TOOLTEST -DSGL_QUOTE=\'H\' -DDBL_QUOTE=\"HDF\" -DMISC=42 $args
+FCBASE=`grep "FCBASE=" $H5TOOL_BIN | xargs basename`
+WF=""
+if grep -qi "xlf" <<< "$FCBASE"; then
+    WF="-WF,"
+fi
+TOOLTEST $WF-DSGL_QUOTE=\'H\' $WF-DDBL_QUOTE=\"HDF\" $WF-DMISC=42 $args
 
 # No preprocess test since -E is not a common option for Fortran compilers.