diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ= 100755
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ= 100755
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50 100755
--- a/tests/test-convergedmerge.t
+++ b/tests/test-convergedmerge.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA== 100755
--- a/tests/test-empty-working-tree.t
+++ b/tests/test-empty-working-tree.t
@@ -9,13 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1lbmNvZGluZy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1lbmNvZGluZy50 100755
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -12,7 +12,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA== 100755
--- a/tests/test-file-removal.t
+++ b/tests/test-file-removal.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-git-clone.t b/tests/test-git-clone.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1naXQtY2xvbmUudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1naXQtY2xvbmUudA== 100755
--- a/tests/test-git-clone.t
+++ b/tests/test-git-clone.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-git-submodules.t b/tests/test-git-submodules.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy50 100644
--- a/tests/test-git-submodules.t
+++ b/tests/test-git-submodules.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1naXQtdGFncy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1naXQtdGFncy50 100755
--- a/tests/test-git-tags.t
+++ b/tests/test-git-tags.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-git-workflow.t b/tests/test-git-workflow.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1naXQtd29ya2Zsb3cudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1naXQtd29ya2Zsb3cudA== 100755
--- a/tests/test-git-workflow.t
+++ b/tests/test-git-workflow.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1oZy1hdXRob3IudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1oZy1hdXRob3IudA== 100755
--- a/tests/test-hg-author.t
+++ b/tests/test-hg-author.t
@@ -10,14 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
-
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1oZy1icmFuY2gudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1oZy1icmFuY2gudA== 100755
--- a/tests/test-hg-branch.t
+++ b/tests/test-hg-branch.t
@@ -10,12 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1oZy10YWdzLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1oZy10YWdzLnQ= 100755
--- a/tests/test-hg-tags.t
+++ b/tests/test-hg-tags.t
@@ -10,13 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-incoming.t b/tests/test-incoming.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1pbmNvbWluZy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1pbmNvbWluZy50 100755
--- a/tests/test-incoming.t
+++ b/tests/test-incoming.t
@@ -14,7 +14,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-keywords.t b/tests/test-keywords.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1rZXl3b3Jkcy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1rZXl3b3Jkcy50 100755
--- a/tests/test-keywords.t
+++ b/tests/test-keywords.t
@@ -9,7 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-merge.t b/tests/test-merge.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1tZXJnZS50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1tZXJnZS50 100755
--- a/tests/test-merge.t
+++ b/tests/test-merge.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-octopus.t b/tests/test-octopus.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1vY3RvcHVzLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1vY3RvcHVzLnQ= 100755
--- a/tests/test-octopus.t
+++ b/tests/test-octopus.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-outgoing.t b/tests/test-outgoing.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1vdXRnb2luZy50..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1vdXRnb2luZy50 100755
--- a/tests/test-outgoing.t
+++ b/tests/test-outgoing.t
@@ -7,7 +7,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-pull-after-strip.t b/tests/test-pull-after-strip.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLnQ= 100755
--- a/tests/test-pull-after-strip.t
+++ b/tests/test-pull-after-strip.t
@@ -21,7 +21,6 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
-  > bookmarks=
   > mq=
   > EOF
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
diff --git a/tests/test-pull.t b/tests/test-pull.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1wdWxsLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1wdWxsLnQ= 100755
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-push-r.t b/tests/test-push-r.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1wdXNoLXIudA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1wdXNoLXIudA== 100755
--- a/tests/test-push-r.t
+++ b/tests/test-push-r.t
@@ -4,7 +4,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init test
   $ cd test
diff --git a/tests/test-push.t b/tests/test-push.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC1wdXNoLnQ=..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC1wdXNoLnQ= 100755
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -10,8 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t
index 8ede232d3c70ded596ca055290e1fb2fd4086525_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA==..bc7b18c2e5ef9119d6e85a584c69ff5b60ded801_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA== 100755
--- a/tests/test-tree-decomposition.t
+++ b/tests/test-tree-decomposition.t
@@ -9,7 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL