diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index aaecbeb25c..727bcaded7 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-04  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ld/ld-lib.exp (run_dump_test): When using the map option, no
+	program is required.
+
 2015-08-04  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* ld/ld-lib.exp (run_dump_test): Add error_output and
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 8bb06ff523..6904499a10 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -761,6 +761,7 @@ proc run_dump_test { name {extra_options {}} } {
 	    }
 	}
 	if { $program == "" \
+                 && $opts(map) == "" \
                  && $opts(warning) == "" \
                  && $opts(warning_output) == "" \
                  && $opts(error) == "" \
@@ -995,6 +996,10 @@ proc run_dump_test { name {extra_options {}} } {
             } else {
                 pass "$testname (map file check)"
             }
+
+            if { $program == "" } then {
+                return
+            }
         }
     } else {
 	set objfile "tmpdir/dump0.o"