Index: subversion/tests/clients/cmdline/copy_tests.py
===================================================================
--- subversion/tests/clients/cmdline/copy_tests.py	(revision 16119)
+++ subversion/tests/clients/cmdline/copy_tests.py	(working copy)
@@ -1613,9 +1613,9 @@
 # Issue 1516: WC replacement of files requires
 # a second text-base and prop-base
 
-def wc_copy_replacement(sbox):
-  "svn cp PATH PATH replacement of deleted target"
-
+#----------------------------------------------------------------------
+# Helper for wc_copy_replacement and repos_to_wc_copy_replacement
+def copy_replace(sbox, wc_copy):
   sbox.build()
   wc_dir = sbox.wc_dir
 
@@ -1629,9 +1629,13 @@
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # The copy shouldn't fail
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+  if wc_copy:
+    pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+  else:
+    pi_src = svntest.main.current_repo_url + '/A/D/G/pi'
+
   svntest.actions.run_and_verify_svn("", None, [],
-                                     'cp', pi_path, rho_path)
+                                     'cp', pi_src, rho_path)
 
   # Now commit
   expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
@@ -1650,10 +1654,9 @@
                                         wc_dir)
 
 #----------------------------------------------------------------------
-
-def wc_copy_replace_with_props(sbox):
-  "svn cp PATH PATH replace with props"
-
+# Helper for wc_copy_replace_with_props and
+# repos_to_wc_copy_replace_with_props
+def copy_replace_with_props(sbox, wc_copy):
   sbox.build()
   wc_dir = sbox.wc_dir
 
@@ -1703,8 +1706,13 @@
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # The copy shouldn't fail
+  if wc_copy:
+    pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+  else:
+    pi_src = svntest.main.current_repo_url + '/A/D/G/pi'
+
   svntest.actions.run_and_verify_svn("", None, [],
-                                     'cp', pi_path, rho_path)
+                                     'cp', pi_src, rho_path)
 
   # Verify both content and props have been copied
   expected_disk.tweak('A/D/G/rho',
@@ -1728,44 +1736,28 @@
                                         expected_status,
                                         None, None, None, None, None,
                                         wc_dir)
+ 
 
+def wc_copy_replacement(sbox):
+  "svn cp PATH PATH replace file"
+  
+  copy_replace(sbox, True)
 
-def repos_to_wc_copy_replacement(sbox):
-  "svn cp URL PATH replacement of deleted target"
+def wc_copy_replace_with_props(sbox):
+  "svn cp PATH PATH replace file with props"
 
-  sbox.build()
-  wc_dir = sbox.wc_dir
+  copy_replace_with_props(sbox, True)
 
-  # File scheduled for deletion
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+def repos_to_wc_copy_replacement(sbox):
+  "svn cp URL PATH replace file"
 
-  # Status before attempting copies
-  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
-  expected_status.tweak('A/D/G/rho', status='D ')
-  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+  copy_replace(sbox, False)
 
-  # The copy shouldn't fail
-  pi_url = svntest.main.current_repo_url + "/A/D/G/pi"
-  svntest.actions.run_and_verify_svn("", None, [],
-                                     'cp', pi_url, rho_path)
+def repos_to_wc_copy_replace_with_props(sbox):
+  "svn cp URL PATH replace file with props"
 
-  # Now commit
-  expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
-  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+  copy_replace_with_props(sbox, False)
 
-  expected_status.tweak(repos_rev='2')
-  expected_status.tweak('A/D/G/rho', status='  ', copied=None,
-                        repos_rev='2', wc_rev='2')
-  expected_output = svntest.wc.State(wc_dir, {
-    'A/D/G/rho': Item(verb='Replacing'),
-    })
-  svntest.actions.run_and_verify_commit(wc_dir,
-                                        expected_output,
-                                        expected_status,
-                                        None, None, None, None, None,
-                                        wc_dir)
-
 ########################################################################
 # Run the tests
 
@@ -1804,6 +1796,7 @@
               wc_copy_replacement,
               wc_copy_replace_with_props,
               repos_to_wc_copy_replacement,
+              repos_to_wc_copy_replace_with_props,
              ]
 
 if __name__ == '__main__':