diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6586f84..04b08ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        hg: [ '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4' ]
+        hg: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8', '6.9' ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
diff --git a/git-remote-hg b/git-remote-hg
index b480fbf..ffeb43c 100755
--- a/git-remote-hg
+++ b/git-remote-hg
@@ -697,7 +697,7 @@ def export_ref(repo, name, kind, head):
                 extra_msg += b"rename : %s => %s\n" % e
 
             for key, value in compat.iteritems(extra):
-                if key in (b'author', b'committer', b'encoding', b'message', b'branch', b'hg-git'):
+                if key in (b'author', b'committer', b'encoding', b'message', b'branch', b'hg-git', b'transplant_source'):
                     continue
                 elif key == b'hg-git-rename-source' and value == b'git':
                     # extra data that hg-git might put there unconditionally
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 3986c09..7a29a68 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -70,6 +70,8 @@ export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 git config --global init.defaultBranch master
 git config --global protocol.file.allow always
 
+unset XDG_CONFIG_HOME
+
 if [[ $(uname -s) = MSYS* ]]; then
 	test_set_prereq WIN
 	export TEST_CMP='diff --strip-trailing-cr -u'
diff --git a/tools/versions.txt b/tools/versions.txt
index b36231e..e53b012 100644
--- a/tools/versions.txt
+++ b/tools/versions.txt
@@ -39,3 +39,8 @@
 6.2
 6.3
 6.4
+6.5
+6.6
+6.7
+6.8
+6.9