Index: subversion/tests/cmdline/atomic-ra-revprop-change.c
===================================================================
--- subversion/tests/cmdline/atomic-ra-revprop-change.c	(revision 998620)
+++ subversion/tests/cmdline/atomic-ra-revprop-change.c	(working copy)
@@ -226,6 +226,8 @@
                         http_library, pool);
   if (err)
     {
+      if (svn_error_has_cause(err, SVN_ERR_BAD_OLD_VALUE))
+        fprintf(stderr, "atomic-ra-revprop-change failed due to incorrect old value.\n");
       svn_handle_error2(err, stderr, FALSE, "atomic-ra-revprop-change: ");
       svn_error_clear(err);
       exit_code = EXIT_FAILURE;
Index: subversion/tests/cmdline/prop_tests.py
===================================================================
--- subversion/tests/cmdline/prop_tests.py	(revision 998620)
+++ subversion/tests/cmdline/prop_tests.py	(working copy)
@@ -2008,7 +2008,7 @@
 
   def FAILS_WITH_BPV(not_the_old_value, proposed_value):
     if svntest.main.server_has_atomic_revprop():
-      expected_stderr = ".*revprop 'flower' has unexpected value.*"
+      expected_stderr = ".*atomic-ra-revprop-change failed due to incorrect old value.*"
       svntest.actions.run_and_verify_atomic_ra_revprop_change(
          None, None, expected_stderr, 1, repo_url, 0, 'flower',
          not_the_old_value, proposed_value)