diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d918e221d1..af0221b825 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-29  Markus Deuling  <deuling@de.ibm.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/auxv.exp (core_works): Also check is_remote.
+	* gdb.base/checkpoint.exp, gdb.base/multi-forks.exp: Likewise.
+
 2007-04-25  Vladimir Prus  <vladimir@codesourcery.com>
 	
 	* gdb.base/sigaltstack.exp: Use 'srcfile' in error
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index c90d7ed4e4..5267de29ff 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -50,7 +50,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Make it the working directory for gdb and its child.
 set coredir "${objdir}/${subdir}/coredir.[getpid]"
 file mkdir $coredir
-set core_works [isnative]
+set core_works [expr [isnative] && ! [is_remote target]]
 
 # Run GDB on the test program up to where it will dump core.
 
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 297e254e9f..079dcdaa2a 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -21,7 +21,7 @@ if $tracelevel then {
 	strace $tracelevel
 	}
 
-if { ![isnative] } then {
+if { [is_remote target] || ![isnative] } then {
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 0c1c7de720..0b190e1820 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -18,7 +18,7 @@ if $tracelevel then {
 	strace $tracelevel
 	}
 
-if { ![isnative] } then {
+if { [is_remote target] || ![isnative] } then {
     continue
 }