diff --git a/tests/test-commit-unresolved b/tests/test-commit-unresolved
--- a/tests/test-commit-unresolved
+++ b/tests/test-commit-unresolved
@@ -3,12 +3,13 @@
 echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
-function commit {
+
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
diff --git a/tests/test-rebase-abort b/tests/test-rebase-abort
--- a/tests/test-rebase-abort
+++ b/tests/test-rebase-abort
@@ -4,7 +4,7 @@ echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 echo "rebase=" >> $HGRCPATH
 
-function cleanoutput {
+cleanoutput () {
     sed -e 's/\(Rebase status stored to\).*/\1/'  \
         -e 's/\(Rebase status restored from\).*/\1/' \
         -e 's/\(saving bundle to \).*/\1/'
diff --git a/tests/test-rebase-collapse b/tests/test-rebase-collapse
--- a/tests/test-rebase-collapse
+++ b/tests/test-rebase-collapse
@@ -6,16 +6,17 @@ echo "rebase=" >> $HGRCPATH
 
 BASE=`pwd`
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
-function commit {
+
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
-function createrepo {
+createrepo () {
     cd $BASE
     rm -rf a
     hg init a
@@ -50,7 +51,7 @@ echo '% Rebasing'
 hg rebase --base 6 --collapse 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 hg glog  --template '{rev}: {desc}\n'
 
-function createrepocomplex {
+createrepocomplex () {
     cd $BASE
     rm -rf a
     hg init a
diff --git a/tests/test-rebase-conflicts b/tests/test-rebase-conflicts
--- a/tests/test-rebase-conflicts
+++ b/tests/test-rebase-conflicts
@@ -4,7 +4,7 @@ echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 echo "rebase=" >> $HGRCPATH
 
-function cleanoutput {
+cleanoutput () {
     sed -e 's/\(Rebase status stored to\).*/\1/'  \
         -e 's/\(Rebase status restored from\).*/\1/' \
         -e 's/\(saving bundle to \).*/\1/'
diff --git a/tests/test-rebase-interruptions b/tests/test-rebase-interruptions
--- a/tests/test-rebase-interruptions
+++ b/tests/test-rebase-interruptions
@@ -6,16 +6,17 @@ echo "rebase=" >> $HGRCPATH
 
 BASE=`pwd`
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
-function commit {
+
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
-function createrepo {
+createrepo () {
     cd $BASE
     rm -rf a
     hg init a
diff --git a/tests/test-rebase-issue-noparam-single-rev b/tests/test-rebase-issue-noparam-single-rev
--- a/tests/test-rebase-issue-noparam-single-rev
+++ b/tests/test-rebase-issue-noparam-single-rev
@@ -4,7 +4,7 @@ echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 echo "rebase=" >> $HGRCPATH
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
diff --git a/tests/test-rebase-parameters b/tests/test-rebase-parameters
--- a/tests/test-rebase-parameters
+++ b/tests/test-rebase-parameters
@@ -3,17 +3,17 @@
 echo "[extensions]" >> $HGRCPATH
 echo "rebase=" >> $HGRCPATH
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
 
-function commit {
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
-function createrepo {
+createrepo () {
     hg init a
     cd a
     addcommit "c1" 0
diff --git a/tests/test-rebase-pull b/tests/test-rebase-pull
--- a/tests/test-rebase-pull
+++ b/tests/test-rebase-pull
@@ -6,12 +6,13 @@ echo "rebase=" >> $HGRCPATH
 
 BASE=`pwd`
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
-function commit {
+
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
diff --git a/tests/test-rebase-scenario-global b/tests/test-rebase-scenario-global
--- a/tests/test-rebase-scenario-global
+++ b/tests/test-rebase-scenario-global
@@ -6,16 +6,17 @@ echo "rebase=" >> $HGRCPATH
 
 BASE=`pwd`
 
-function addcommit {
+addcommit () {
     echo $1 > $1
     hg add $1
     hg commit -d "${2} 0" -u test -m $1
 }
-function commit {
+
+commit () {
     hg commit -d "${2} 0" -u test -m $1
 }
 
-function createrepo {
+createrepo () {
     cd $BASE
     rm -rf a
     hg init a