--- a/tests/library-infinitepush.sh	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/library-infinitepush.sh	Mon Aug 02 23:43:40 2021 -0400
@@ -14,7 +14,6 @@
   cat >> $HGRCPATH << EOF
 [extensions]
 infinitepush=
-[ui]
 [infinitepush]
 branchpattern=re:scratch/.*
 EOF

--- a/tests/narrow-library.sh	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/narrow-library.sh	Mon Aug 02 23:43:40 2021 -0400
@@ -1,7 +1,6 @@
 cat >> $HGRCPATH <<EOF
 [extensions]
 narrow=
-[ui]
 [experimental]
 changegroup3 = True
 EOF

--- a/tests/remotefilelog-library.sh	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/remotefilelog-library.sh	Mon Aug 02 23:43:40 2021 -0400
@@ -7,7 +7,6 @@
 remotefilelog=
 rebase=
 strip=
-[ui]
 [server]
 preferuncompressed=True
 [experimental]

--- a/tests/test-bookmarks-corner-case.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-bookmarks-corner-case.t	Mon Aug 02 23:43:40 2021 -0400
@@ -16,7 +16,6 @@
 ------------
 
   $ cat >> $HGRCPATH << EOF
-  > [ui]
   > [server]
   > concurrent-push-mode=check-related
   > EOF

--- a/tests/test-bookmarks-pushpull.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-bookmarks-pushpull.t	Mon Aug 02 23:43:40 2021 -0400
@@ -1142,7 +1142,6 @@
   > local=../issue4455-dest/
   > ssh=ssh://user@dummy/issue4455-dest
   > http=http://localhost:$HGPORT/
-  > [ui]
   > EOF
   $ cat >> ../issue4455-dest/.hg/hgrc << EOF
   > [hooks]

--- a/tests/test-bundle2-exchange.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-bundle2-exchange.t	Mon Aug 02 23:43:40 2021 -0400
@@ -28,7 +28,6 @@
   > evolution.createmarkers=True
   > evolution.exchange=True
   > bundle2-output-capture=True
-  > [ui]
   > [command-templates]
   > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
   > [web]
@@ -921,9 +920,6 @@
 
 Test lazily acquiring the lock during unbundle
   $ cp $TESTTMP/hgrc.orig $HGRCPATH
-  $ cat >> $HGRCPATH <<EOF
-  > [ui]
-  > EOF
 
   $ cat >> $TESTTMP/locktester.py <<EOF
   > import os

--- a/tests/test-bundle2-format.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-bundle2-format.t	Mon Aug 02 23:43:40 2021 -0400
@@ -233,7 +233,6 @@
   > bundle2=$TESTTMP/bundle2.py
   > [experimental]
   > evolution.createmarkers=True
-  > [ui]
   > [command-templates]
   > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
   > [web]

--- a/tests/test-bundle2-remote-changegroup.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-bundle2-remote-changegroup.t	Mon Aug 02 23:43:40 2021 -0400
@@ -94,7 +94,6 @@
   $ cat dumb.pid >> $DAEMON_PIDS
 
   $ cat >> $HGRCPATH << EOF
-  > [ui]
   > [command-templates]
   > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
   > EOF

--- a/tests/test-fastannotate-protocol.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-fastannotate-protocol.t	Mon Aug 02 23:43:40 2021 -0400
@@ -1,5 +1,4 @@
   $ cat >> $HGRCPATH << EOF
-  > [ui]
   > [extensions]
   > fastannotate=
   > [fastannotate]

--- a/tests/test-infinitepush-ci.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-infinitepush-ci.t	Mon Aug 02 23:43:40 2021 -0400
@@ -9,7 +9,6 @@
 
   $ . "$TESTDIR/library-infinitepush.sh"
   $ cat >> $HGRCPATH <<EOF
-  > [ui]
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
   > EOF

--- a/tests/test-log.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-log.t	Mon Aug 02 23:43:40 2021 -0400
@@ -2516,8 +2516,7 @@
 is global. So we shouldn't expect the namespace always exists. Using
 ssh:// makes sure a bundle repository is created from scratch. (issue6301)
 
-  $ hg clone \
-  >          -qr0 "ssh://user@dummy/`pwd`/a" a-clone
+  $ hg clone -qr0 "ssh://user@dummy/`pwd`/a" a-clone
   $ hg incoming --config extensions.names=names.py -R a-clone \
   > -T '{bars}\n' -l1
   comparing with ssh://user@dummy/$TESTTMP/a

--- a/tests/test-logexchange.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-logexchange.t	Mon Aug 02 23:43:40 2021 -0400
@@ -2,7 +2,6 @@
 =============================================
 
   $ cat >> $HGRCPATH << EOF
-  > [ui]
   > [alias]
   > glog = log -G -T '{rev}:{node|short}  {desc}'
   > [extensions]

--- a/tests/test-missing-capability.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-missing-capability.t	Mon Aug 02 23:43:40 2021 -0400
@@ -24,9 +24,6 @@
   > [extensions]
   > disable-lookup = $TESTTMP/disable-lookup.py
   > EOF
-  $ cat >> .hg/hgrc <<EOF
-  > [ui]
-  > EOF
 
   $ hg pull ssh://user@dummy/repo1 -r tip -B a
   pulling from ssh://user@dummy/repo1

--- a/tests/test-ssh-bundle1.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-ssh-bundle1.t	Mon Aug 02 23:43:40 2021 -0400
@@ -163,8 +163,6 @@
 updating rc
 
   $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
-  $ echo "[ui]" >> .hg/hgrc
-  $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
 
 find outgoing
 
@@ -462,7 +460,6 @@
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > default-push = ssh://user@dummy/remote
-  > [ui]
   > [extensions]
   > localwrite = localwrite.py
   > EOF

--- a/tests/test-ssh-proto.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-ssh-proto.t	Mon Aug 02 23:43:40 2021 -0400
@@ -28,7 +28,6 @@
   > }
 
   $ cat >> $HGRCPATH << EOF
-  > [ui]
   > [devel]
   > debug.peer-request = true
   > [extensions]

--- a/tests/test-ssh-repoerror.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-ssh-repoerror.t	Mon Aug 02 23:43:40 2021 -0400
@@ -4,12 +4,6 @@
 `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
 buggy. This need to be resolved sooner than later.
 
-initial setup
-
-  $ cat << EOF >> $HGRCPATH
-  > [ui]
-  > EOF
-
 repository itself is non-readable
 ---------------------------------
 

--- a/tests/test-ssh.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-ssh.t	Mon Aug 02 23:43:40 2021 -0400
@@ -149,8 +149,6 @@
 updating rc
 
   $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
-  $ echo "[ui]" >> .hg/hgrc
-  $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
 
 find outgoing
 
@@ -515,7 +513,6 @@
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > default-push = ssh://user@dummy/remote
-  > [ui]
   > [extensions]
   > localwrite = localwrite.py
   > EOF

--- a/tests/test-treemanifest.t	Mon Aug 02 21:25:01 2021 -0400
+++ b/tests/test-treemanifest.t	Mon Aug 02 23:43:40 2021 -0400
@@ -1,7 +1,3 @@
-  $ cat << EOF >> $HGRCPATH
-  > [ui]
-  > EOF
-
 Set up repo
 
   $ hg --config experimental.treemanifest=True init repo