diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 09b4c35462..c518f153f9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-25  Bernhard Heckel  <bernhard.heckel@intel.com>
+
+	* gdb.fortran/whatis_type.exp: Use multi_line.
+
 2016-05-24  Tom Tromey  <tom@tromey.com>
 
 	PR python/17386:
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
index af897a6dc7..b6324e6976 100644
--- a/gdb/testsuite/gdb.fortran/whatis_type.exp
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -39,15 +39,27 @@ set t1_i "$int :: t1_i"
 set t1_r "$real :: t1_r"
 
 gdb_test "whatis t1" \
-  "type = Type t1\r\n${t1_i}\r\n${t1_r}\r\nEnd Type t1" \
+  [multi_line "type = Type t1" \
+	          "$t1_i" \
+	          "$t1_r" \
+	          "End Type t1"] \
   "whatis t1"
 gdb_test "whatis t1v" \
-  "type = Type t1\r\n${t1_i}\r\n${t1_r}\r\nEnd Type t1" \
+  [multi_line "type = Type t1" \
+	          "$t1_i" \
+	          "$t1_r" \
+	          "End Type t1"] \
   "whatis t1v"
 
 gdb_test "ptype t1" \
-  "type = Type t1\r\n    ${t1_i}\r\n    ${t1_r}\r\nEnd Type t1" \
+  [multi_line "type = Type t1" \
+	          "    $t1_i" \
+	          "    $t1_r" \
+	          "End Type t1"] \
   "ptype t1"
 gdb_test "ptype t1v" \
-  "type = Type t1\r\n    ${t1_i}\r\n    ${t1_r}\r\nEnd Type t1" \
+  [multi_line "type = Type t1" \
+	          "    $t1_i" \
+	          "    $t1_r" \
+	          "End Type t1"] \
   "ptype t1v"