Index: subversion/tests/cmdline/lock_tests.py
===================================================================
--- subversion/tests/cmdline/lock_tests.py	(revision 1148778)
+++ subversion/tests/cmdline/lock_tests.py	(working copy)
@@ -1720,7 +1720,25 @@
                                       1, 'unlock', pi_path)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
+#----------------------------------------------------------------------
+def lock_invalid_token(sbox):
+  "verify pre-lock hook returning invalid token"
 
+  sbox.build()
+
+  hook_path = os.path.join(sbox.repo_dir, 'hooks', 'pre-lock')
+  svntest.main.create_python_hook_script(hook_path, 'import sys\n'
+    'sys.stdout.write("multiline token\\nsecond line")\n'
+    'sys.exit(0)\n')
+
+  fname = 'iota'
+  file_path = os.path.join(sbox.wc_dir, fname)
+
+  svntest.actions.run_and_verify_svn(None, None,
+                                     "svn: E160037: Lock token contains illegal characters",
+                                     'lock', '-m', '', file_path)
+
+
 ########################################################################
 # Run the tests
 
@@ -1768,6 +1786,7 @@
               cp_isnt_ro,
               update_locked_deleted,
               block_unlock_if_pre_unlock_hook_fails,
+              lock_invalid_token,
             ]
 
 if __name__ == '__main__':