diff --git a/hgext3rd/fbhistedit.py b/hgext3rd/fbhistedit.py
--- a/hgext3rd/fbhistedit.py
+++ b/hgext3rd/fbhistedit.py
@@ -153,21 +153,17 @@
     defineactions()
     _extend_histedit(ui)
 
-    if ui.config('experimental', 'histeditng'):
-        rebase = extensions.find('rebase')
-        extensions.wrapcommand(rebase.cmdtable, 'rebase', _rebase,
-                               synopsis=' [-i]')
-
-        aliases, entry = cmdutil.findcmd('rebase', rebase.cmdtable)
-        newentry = list(entry)
-        options = newentry[1]
-        # dirty hack because we need to change an existing switch
-        for idx, opt in enumerate(options):
-            if opt[0] == 'i':
-                del options[idx]
-        options.append(('i', 'interactive', False, 'interactive rebase'))
-        rebase.cmdtable['rebase'] = tuple(newentry)
-
+    rebase = extensions.find('rebase')
+    extensions.wrapcommand(rebase.cmdtable, 'rebase', _rebase, synopsis='[-i]')
+    aliases, entry = cmdutil.findcmd('rebase', rebase.cmdtable)
+    newentry = list(entry)
+    options = newentry[1]
+    # dirty hack because we need to change an existing switch
+    for idx, opt in enumerate(options):
+        if opt[0] == 'i':
+            del options[idx]
+    options.append(('i', 'interactive', False, 'interactive rebase'))
+    rebase.cmdtable['rebase'] = tuple(newentry)
 
 def _extend_histedit(ui):
     histedit = extensions.find('histedit')
diff --git a/tests/test-fbhistedit-exec-obsolete.t b/tests/test-fbhistedit-exec-obsolete.t
--- a/tests/test-fbhistedit-exec-obsolete.t
+++ b/tests/test-fbhistedit-exec-obsolete.t
@@ -2,8 +2,9 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > rebase=
   > EOF
 
 Enable obsolete
diff --git a/tests/test-fbhistedit-exec.t b/tests/test-fbhistedit-exec.t
--- a/tests/test-fbhistedit-exec.t
+++ b/tests/test-fbhistedit-exec.t
@@ -2,8 +2,9 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > rebase=
   > EOF
 
   $ initrepo ()
diff --git a/tests/test-fbhistedit-rebase-interactive.t b/tests/test-fbhistedit-rebase-interactive.t
--- a/tests/test-fbhistedit-rebase-interactive.t
+++ b/tests/test-fbhistedit-rebase-interactive.t
@@ -1,12 +1,10 @@
   $ . "$TESTDIR/histedit-helpers.sh"
 
   $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > histeditng=True
   > [extensions]
-  > rebase=
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > rebase=
   > EOF
 
   $ initrepo ()
diff --git a/tests/test-fbhistedit-show-plan.t b/tests/test-fbhistedit-show-plan.t
--- a/tests/test-fbhistedit-show-plan.t
+++ b/tests/test-fbhistedit-show-plan.t
@@ -2,8 +2,9 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > rebase=
   > EOF
 
   $ initrepo ()
diff --git a/tests/test-fbhistedit-stop-obsolete.t b/tests/test-fbhistedit-stop-obsolete.t
--- a/tests/test-fbhistedit-stop-obsolete.t
+++ b/tests/test-fbhistedit-stop-obsolete.t
@@ -2,8 +2,9 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > rebase=
   > EOF
 
 Enable obsolete
diff --git a/tests/test-morestatus.t b/tests/test-morestatus.t
--- a/tests/test-morestatus.t
+++ b/tests/test-morestatus.t
@@ -3,9 +3,10 @@
   > show=True
   > [extensions]
   > morestatus=$TESTDIR/../hgext3rd/morestatus.py
+  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > histedit=
+  > rebase=
   > reset=$TESTDIR/../hgext3rd/reset.py
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
   > EOF
   $ cat >> $TESTTMP/breakupdate.py << EOF
   > import sys