diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 333637f365..4f0e069a63 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.python/py-value.exp (test_value_in_inferior): Skip arg0 test
+	if arguments are not supported.
+
 2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.cp/overload.exp: Allow foo::overload1arg's "this" pointer to
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index aa4e519da8..d980a3d603 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -227,7 +227,9 @@ proc test_value_in_inferior {} {
   gdb_py_test_silent_cmd "python arg0 = argv.dereference ()" "dereference value" 1
 
   # Check that the dereferenced value is sane
-  gdb_test "python print arg0" "0x.*$testfile\"" "verify dereferenced value"
+  if { ! [target_info exists noargs] } {
+    gdb_test "python print arg0" "0x.*$testfile\"" "verify dereferenced value"
+  }
 
   # Smoke-test is_optimized_out attribute
   gdb_test "python print 'result =', arg0.is_optimized_out" "= False" "Test is_optimized_out attribute"