diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 673a7da822a..1fef88cf84b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* lib/gcc-dg.exp (${tool}_load): Add default return value handler.
+
 2016-04-22  Dominique d'Humieres  <dominiq@lps.ens.fr>
 
 	* gfortran.dg/submodule_14.f08: Add cleanup-submodules.
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index b732b54f410..39a7c208c31 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -403,6 +403,7 @@ if { [info procs ${tool}_load] != [list] \
 	    switch [lindex $result 0] {
 		"pass" { set status "fail" }
 		"fail" { set status "pass" }
+		default { set status [lindex $result 0] }
 	    }
 	    set result [list $status [lindex $result 1]]
 	}