Index: Fortran/UnitTests/fcvs21_f95/FM905.reference_output
===================================================================
--- Fortran/UnitTests/fcvs21_f95/FM905.reference_output
+++ Fortran/UnitTests/fcvs21_f95/FM905.reference_output
@@ -67,8 +67,7 @@
        5 O'CLOCK
      9    INSPECT
                  COMPUTED= 
- SHORTTHIS IS A LONGER CHARACTER STRING1234567890123456789012345678901234567890
- 12345678901234567890123456789012          
+ SHORTTHIS IS A LONGER CHARACTER STRING123456789012345678901234567890123456789012345678901234567890123456789012          
                  CORRECT=  
  SHORT  THIS IS A LONGER CHARACTER STRING 123456789012345678901234567890123456789
  012345678901234567890123456789012
Index: Fortran/UnitTests/fcvs21_f95/lit.local.cfg
===================================================================
--- Fortran/UnitTests/fcvs21_f95/lit.local.cfg
+++ Fortran/UnitTests/fcvs21_f95/lit.local.cfg
@@ -6,3 +6,12 @@
 # they might choke on warnings about signaling INEXACT exceptions.
 if 'NO_STOP_MESSAGE' in os.environ:
   config.environment['NO_STOP_MESSAGE'] = os.environ['NO_STOP_MESSAGE']
+
+# Flang uses FORT_FMT_RECL to control the length of a line for list-directed
+# output. FM905 needs a large enough value for this (values larger than about
+# 150 should work). We either forward the value that we find in the environment,
+# or set a default of 1000 to make sure the test passes.
+if 'FORT_FMT_RECL' in os.environ:
+  config.environment['FORT_FMT_RECL'] = os.environ['FORT_FMT_RECL']
+else:
+  config.environment['FORT_FMT_RECL'] = "1000"