diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -643,10 +643,10 @@ class queue(object):
 
             message = ph.message
             if not message:
-                message = _("imported patch %s\n") % patchname
+                message = "imported patch %s\n" % patchname
             else:
                 if list:
-                    message.append(_("\nimported patch %s") % patchname)
+                    message.append("\nimported patch %s" % patchname)
                 message = '\n'.join(message)
 
             if ph.haspatch:
diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -23,7 +23,7 @@ def cvslog(ui,repo,hooktype,log):
 def cvschangesets(ui,repo,hooktype,changesets):
     print "%s hook: %d changesets"%(hooktype,len(changesets))
 EOF
-hookpath=$PWD
+hookpath=`pwd`
 
 echo "[hooks]" >> $HGRCPATH
 echo "cvslog=python:$hookpath/cvshooks.py:cvslog" >> $HGRCPATH
@@ -32,7 +32,7 @@ echo "cvschangesets=python:$hookpath/cvs
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-CVSROOT=$PWD
+CVSROOT=`pwd`
 export CVSROOT
 CVS_OPTIONS=-f
 export CVS_OPTIONS
diff --git a/tests/test-convert-p4-filetypes b/tests/test-convert-p4-filetypes
--- a/tests/test-convert-p4-filetypes
+++ b/tests/test-convert-p4-filetypes
@@ -6,7 +6,7 @@ echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 echo % create p4 depot
-P4ROOT=$PWD/depot; export P4ROOT
+P4ROOT=`pwd`/depot; export P4ROOT
 P4AUDIT=$P4ROOT/audit; export P4AUDIT
 P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
 P4LOG=$P4ROOT/log; export P4LOG