diff --git a/hgext3rd/tweakdefaults.py b/hgext3rd/tweakdefaults.py
--- a/hgext3rd/tweakdefaults.py
+++ b/hgext3rd/tweakdefaults.py
@@ -795,7 +795,7 @@
     try:
         extensions.find('inhibit')
         # if inhibit is enabled, allow divergence
-        overrides[('experimental', 'allowdivergence')] = True
+        overrides[('experimental', 'evolution.allowdivergence')] = True
     except KeyError:
         pass
     with repo.ui.configoverride(overrides, 'tweakdefaults'):
diff --git a/tests/test-fbamend-restack.t b/tests/test-fbamend-restack.t
--- a/tests/test-fbamend-restack.t
+++ b/tests/test-fbamend-restack.t
@@ -6,7 +6,7 @@
   > inhibit=$TESTDIR/../hgext3rd/inhibit.py
   > rebase=
   > [experimental]
-  > allowdivergence = True
+  > evolution.allowdivergence = True
   > evolution = createmarkers, allowunstable
   > [fbamend]
   > # do not write preamend bookmarks
diff --git a/tests/test-smartlog-obsolete.t b/tests/test-smartlog-obsolete.t
--- a/tests/test-smartlog-obsolete.t
+++ b/tests/test-smartlog-obsolete.t
@@ -10,7 +10,7 @@
   > histeditkeepdate = true
   > [experimental]
   > evolution = createmarkers, allowunstable
-  > allowdivergence = on
+  > evolution.allowdivergence = on
   > [ui]
   > interactive = true
   > EOF
diff --git a/tests/test-smartlog-tweakdefaults.t b/tests/test-smartlog-tweakdefaults.t
--- a/tests/test-smartlog-tweakdefaults.t
+++ b/tests/test-smartlog-tweakdefaults.t
@@ -6,7 +6,7 @@
   > fbamend=$TESTDIR/../hgext3rd/fbamend
   > [experimental]
   > evolution=createmarkers
-  > allowdivergence=on
+  > evolution.allowdivergence=on
   > EOF
 
 Prepare a repo for amend checks
diff --git a/tests/test-tweakdefaults.t b/tests/test-tweakdefaults.t
--- a/tests/test-tweakdefaults.t
+++ b/tests/test-tweakdefaults.t
@@ -525,7 +525,7 @@
   > [experimental]
   > evolution=createmarkers
   > prunestrip=on
-  > allowdivergence=off
+  > evolution.allowdivergence=off
   > [extensions]
   > strip=
   > fbamend=$TESTDIR/../hgext3rd/fbamend
@@ -552,7 +552,7 @@
 Test that we show divergence warning if inhibit is disabled
   $ hg rebase -r 1 -d 3 --hidden
   abort: this rebase will cause divergences from: 09d39afb522a
-  (to force the rebase please set experimental.allowdivergence=True)
+  (to force the rebase please set experimental.evolution.allowdivergence=True)
   [255]
 
 Test that we do not show divergence warning if inhibit is enabled