diff --git a/gas/testsuite/Makefile.in b/gas/testsuite/Makefile.in
index 143cac991f..666ffe8190 100644
--- a/gas/testsuite/Makefile.in
+++ b/gas/testsuite/Makefile.in
@@ -106,6 +106,7 @@ check:  site.exp
 	   TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
 	   export TCL_LIBRARY ; fi ; \
 	$(RUNTEST) $(RUNTESTFLAGS) --tool gas 
+	$(RUNTEST) $(RUNTESTFLAGS) --tool gasp
 
 force:
 
diff --git a/gas/testsuite/config/default.exp b/gas/testsuite/config/default.exp
index b207f55e19..01ffe43a7f 100644
--- a/gas/testsuite/config/default.exp
+++ b/gas/testsuite/config/default.exp
@@ -2,8 +2,12 @@ load_lib gas-defs.exp
 
 global AS
 if ![info exists AS] then {
-    set AS [findfile $base_dir/as.new "as.new" [transform as]]
+    set AS [findfile $base_dir/../as.new "../as.new" [transform as]]
+}
 
+global GASP
+if ![info exists GASP] then {
+    set GASP [findfile $base_dir/../gasp.new "../gasp.new" [transform gasp]]
 }
 
 global ASFLAGS
@@ -11,4 +15,14 @@ if ![info exists ASFLAGS] then {
     set ASFLAGS ""
 }
 
+if ![info exists OBJDUMP] then {
+    set OBJDUMP [findfile $base_dir/../../binutils/objdump \
+			  $base_dir/../../binutils/objdump \
+			  [transform objdump]]
+}
+
+if ![info exists OBJDUMPFLAGS] then {
+    set OBJDUMPFLAGS {}
+}
+
 gas_init