diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6ed0407cc3..866593ec44 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* gdb.base/testenv.exp: Skip on remote targets.  Unset global
+	environment variable after test completed.
+
 2011-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* gdb.base/solib-nodir.exp: Skip if remote target.
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index ad39f1451d..dae35b6f88 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -22,6 +22,10 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+# There's no support for passing environment variables in the remote protocol.
+if { [is_remote target] } {
+    return 0
+}
 
 set testfile "testenv"
 set srcfile ${testfile}.c
@@ -119,3 +123,7 @@ gdb_test "continue" \
   "Test with TEST_GDB_GLOBAL unset"
 
 gdb_exit
+
+# Clear environment in case we're doing multiple runs
+unset env(TEST_GDB_GLOBAL)
+