diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 23d3cc2783b..87b917e0c55 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* gdb.cp/psymtab-parameter.cc (func): Change return type back to long.
+	Return 0 as a long.
+	* gdb.cp/psymtab-parameter.exp: Change func's return type back to long.
+
 2017-11-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	* gdb.cp/breakpoint.cc (bar): Set return type to void.
diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.cc b/gdb/testsuite/gdb.cp/psymtab-parameter.cc
index 9f63fefcaeb..63038f03237 100644
--- a/gdb/testsuite/gdb.cp/psymtab-parameter.cc
+++ b/gdb/testsuite/gdb.cp/psymtab-parameter.cc
@@ -16,9 +16,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 template <typename T>
-void
+long
 func ()
 {
+  return 0L;
 }
 
 void
diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.exp b/gdb/testsuite/gdb.cp/psymtab-parameter.exp
index 5c4b6ac7192..3d78de91f4b 100644
--- a/gdb/testsuite/gdb.cp/psymtab-parameter.exp
+++ b/gdb/testsuite/gdb.cp/psymtab-parameter.exp
@@ -31,6 +31,6 @@ gdb_test_no_output "set language c++"
 # XFAIL than FAIL here.  For example -readnow breaks it.
 gdb_test_no_output "maintenance info symtabs"
 
-# GDB has shown only the `void func<short>()' ELF symbol before, not the DWARF
+# GDB has shown only the `long func<short>()' ELF symbol before, not the DWARF
 # symbol
 gdb_test "complete p 'func<short>(" "p 'func<short>\\(\\)"