diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -675,9 +675,6 @@
     b'experimental', b'rust.index', default=False,
 )
 coreconfigitem(
-    b'experimental', b'exp-persistent-nodemap', default=False,
-)
-coreconfigitem(
     b'experimental', b'exp-persistent-nodemap.mmap', default=True,
 )
 coreconfigitem(
@@ -787,6 +784,9 @@
     b'format', b'usestore', default=True,
 )
 coreconfigitem(
+    b'format', b'use-persistent-nodemap', default=False, experimental=True
+)
+coreconfigitem(
     b'format',
     b'exp-use-copies-side-data-changeset',
     default=False,
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -3658,7 +3658,7 @@
     if ui.configbool(b'format', b'bookmarks-in-store'):
         requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
 
-    if ui.configbool(b'experimental', b'exp-persistent-nodemap'):
+    if ui.configbool(b'format', b'use-persistent-nodemap'):
         requirements.add(NODEMAP_REQUIREMENT)
 
     return requirements
diff --git a/tests/test-persistent-nodemap.t b/tests/test-persistent-nodemap.t
--- a/tests/test-persistent-nodemap.t
+++ b/tests/test-persistent-nodemap.t
@@ -3,8 +3,8 @@
 ===================================
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
-  > exp-persistent-nodemap=yes
+  > [format]
+  > use-persistent-nodemap=yes
   > [devel]
   > persistent-nodemap=yes
   > EOF