--- a/tests/facing_problems.t	Sun Sep 25 22:02:55 2016 +0200
+++ b/tests/facing_problems.t	Sun Sep 25 22:12:17 2016 +0200
@@ -70,12 +70,12 @@
   abort: repository is unrelated
   [255]
 
-  $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n'
+  $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n'
   0: First
 
-  $ hg --cwd $GOOD2 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n'
 
-  $ hg --cwd $UNREL log  -T '{rev}: {desc}\n'
+  $ hg --cwd $UNREL log --template '{rev}: {desc}\n'
   0: Unrelated
 
 and again, but in non-breaking mode
@@ -106,15 +106,15 @@
   adding file changes
   added 2 changesets with 2 changes to 1 files
 
-  $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n'
+  $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n'
   1: Second
   0: First
 
-  $ hg --cwd $GOOD2 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n'
   1: Second
   0: First
 
-  $ hg --cwd $UNREL log  -T '{rev}: {desc}\n'
+  $ hg --cwd $UNREL log --template '{rev}: {desc}\n'
   0: Unrelated
 
 Let's also test pulling 
@@ -198,7 +198,7 @@
   abort: repository is unrelated
   [255]
  
-  $ hg --cwd $BASE log -T '{rev}: {desc}\n'
+  $ hg --cwd $BASE log --template '{rev}: {desc}\n'
   2: In repo1
   1: Second
   0: First
@@ -223,7 +223,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
  
-  $ hg --cwd $BASE log -T '{rev}: {desc}\n'
+  $ hg --cwd $BASE log --template '{rev}: {desc}\n'
   3: In good2
   2: In repo1
   1: Second