--- a/tests/groups-modern.t	Sun Sep 25 22:02:55 2016 +0200
+++ b/tests/groups-modern.t	Sun Sep 25 22:12:17 2016 +0200
@@ -71,15 +71,15 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
-  $ hg --cwd $REP1 log -T '{rev}: {desc}\n'
+  $ hg --cwd $REP1 log --template '{rev}: {desc}\n'
   0: First
 
-  $ hg --cwd $REP2 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP2 log --template '{rev}: {desc}\n'
 
-  $ hg --cwd $REP3 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP3 log --template '{rev}: {desc}\n'
   0: First
 
-  $ hg --cwd $REP4 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP4 log --template '{rev}: {desc}\n'
 
 
   $ cat >> $BASE/file.txt << EOF
@@ -104,17 +104,17 @@
   adding file changes
   added 2 changesets with 2 changes to 1 files
 
-  $ hg --cwd $REP1 log -T '{rev}: {desc}\n'
+  $ hg --cwd $REP1 log --template '{rev}: {desc}\n'
   0: First
 
-  $ hg --cwd $REP2 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP2 log --template '{rev}: {desc}\n'
   1: Second
   0: First
 
-  $ hg --cwd $REP3 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP3 log --template '{rev}: {desc}\n'
   0: First
 
-  $ hg --cwd $REP4 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP4 log --template '{rev}: {desc}\n'
   1: Second
   0: First
 
@@ -181,7 +181,7 @@
   searching for changes
   no changes found
 
-  $ hg --cwd $BASE log  -T '{rev}: {desc}\n'
+  $ hg --cwd $BASE log --template '{rev}: {desc}\n'
   2: In repo1
   1: Second
   0: First
@@ -312,7 +312,7 @@
   adding file changes
   added 3 changesets with 3 changes to 1 files
 
-  $ hg --cwd $BASE log  -T '{rev}: {desc}\n'
+  $ hg --cwd $BASE log --template '{rev}: {desc}\n'
   5: Normal
   4: Br1
   3: In repo2
@@ -320,19 +320,19 @@
   1: Second
   0: First
 
-  $ hg --cwd $REP1 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP1 log --template '{rev}: {desc}\n'
   4: Normal
   3: In repo2
   2: Second
   1: In repo1
   0: First
 
-  $ hg --cwd $REP2 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP2 log --template '{rev}: {desc}\n'
   2: In repo2
   1: Second
   0: First
 
-  $ hg --cwd $REP3 log  -T '{rev}: {desc}\n'
+  $ hg --cwd $REP3 log --template '{rev}: {desc}\n'
   3: Normal
   2: In repo2
   1: Second