--- a/tests/test-blackbox.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-blackbox.t	Sat Dec 15 17:52:14 2018 +0900
@@ -22,6 +22,9 @@
   > [alias]
   > confuse = log --limit 3
   > so-confusing = confuse --style compact
+  > [blackbox]
+  > track = backupbundle, branchcache, command, commandalias, commandexception,
+  >         commandfinish, debug, exthook, incoming, pythonhook, tagscache
   > EOF
 
   $ hg init blackboxtest

--- a/tests/test-devel-warnings.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-devel-warnings.t	Sat Dec 15 17:52:14 2018 +0900
@@ -83,6 +83,8 @@
   > blackbox=
   > [devel]
   > all-warnings=1
+  > [blackbox]
+  > track = command, commandexception, commandfinish, develwarn
   > EOF
 
   $ hg init lock-checker

--- a/tests/test-merge-subrepos.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-merge-subrepos.t	Sat Dec 15 17:52:14 2018 +0900
@@ -57,7 +57,8 @@
 
 A deleted subrepo file is flagged as dirty, like the top level repo
 
-  $ hg id --config extensions.blackbox= --config blackbox.dirty=True
+  $ hg id --config extensions.blackbox= --config blackbox.dirty=True \
+  > --config blackbox.track='command commandfinish'
   9bfe45a197d7+ tip
   $ cat .hg/blackbox.log
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> serve --cmdserver chgunix * (glob) (chg !)

--- a/tests/test-obsolete-tag-cache.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-obsolete-tag-cache.t	Sat Dec 15 17:52:14 2018 +0900
@@ -4,6 +4,9 @@
   > rebase=
   > mock=$TESTDIR/mockblackbox.py
   > 
+  > [blackbox]
+  > track = command, commandfinish, tagscache
+  > 
   > [experimental]
   > evolution.createmarkers=True
   > EOF

--- a/tests/test-setdiscovery.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-setdiscovery.t	Sat Dec 15 17:52:14 2018 +0900
@@ -543,14 +543,14 @@
   > unrandomsample = $TESTTMP/unrandomsample.py
   > EOF
 
-  $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=
+  $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \
+  > --config blackbox.track='command commandfinish discovery'
   comparing with r2
   searching for changes
   101 102 103 104 105 106 107 108 109 110  (no-eol)
-  $ hg -R r1 --config extensions.blackbox= blackbox
+  $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track=
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
-  * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 --config *extensions.blackbox=* blackbox (glob)
   $ cd ..

--- a/tests/test-tags.t	Sun Dec 16 16:31:31 2018 +0900
+++ b/tests/test-tags.t	Sat Dec 15 17:52:14 2018 +0900
@@ -4,6 +4,8 @@
   > [extensions]
   > blackbox=
   > mock=$TESTDIR/mockblackbox.py
+  > [blackbox]
+  > track = command, commandfinish, tagscache
   > EOF
 
 Helper functions: