diff --git a/tests/p4setup.sh b/tests/p4setup.sh
index eb3fdcd05c..991263e8b3 100644
--- a/tests/p4setup.sh
+++ b/tests/p4setup.sh
@@ -1,6 +1,6 @@
 cat >> $HGRCPATH<<EOF
 [extensions]
-p4fastimport=$TESTDIR/../hgext3rd/p4fastimport
+p4fastimport=$TESTDIR/../hgext/p4fastimport
 EOF
 
 # create p4 depot
diff --git a/tests/test-fb-hgext-age.t b/tests/test-fb-hgext-age.t
index 10337b6a48..78f875dac6 100644
--- a/tests/test-fb-hgext-age.t
+++ b/tests/test-fb-hgext-age.t
@@ -1,7 +1,7 @@
 
   $ cat << EOF >> $HGRCPATH
   > [extensions]
-  > age=$TESTDIR/../hgext3rd/age.py
+  > age=
   > EOF
 
 Setup repo
diff --git a/tests/test-fb-hgext-backup.t b/tests/test-fb-hgext-backup.t
index 8158508070..a5d243b06d 100644
--- a/tests/test-fb-hgext-backup.t
+++ b/tests/test-fb-hgext-backup.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > backups=$TESTDIR/../hgext3rd/backups.py
+  > backups=
   > strip=
   > EOF
 
diff --git a/tests/test-fb-hgext-catnotate.t b/tests/test-fb-hgext-catnotate.t
index 231231dde8..4710011f3b 100644
--- a/tests/test-fb-hgext-catnotate.t
+++ b/tests/test-fb-hgext-catnotate.t
@@ -4,7 +4,7 @@ Test catnotate
   $ cd repo1
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > catnotate=$TESTDIR/../hgext3rd/catnotate.py
+  > catnotate=
   > strip=
   > EOF
 
diff --git a/tests/test-fb-hgext-checkmessagehook.t b/tests/test-fb-hgext-checkmessagehook.t
index 59cd44e911..ab6e981568 100644
--- a/tests/test-fb-hgext-checkmessagehook.t
+++ b/tests/test-fb-hgext-checkmessagehook.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > checkmessagehook = $TESTDIR/../hgext3rd/checkmessagehook.py
+  > checkmessagehook=
   > EOF
 
 Build up a repo
diff --git a/tests/test-fb-hgext-cleanobsstore.t b/tests/test-fb-hgext-cleanobsstore.t
index 1fc9537d16..0cbb9f114d 100644
--- a/tests/test-fb-hgext-cleanobsstore.t
+++ b/tests/test-fb-hgext-cleanobsstore.t
@@ -1,8 +1,8 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > cleanobsstore=$TESTDIR/../hgext3rd/cleanobsstore.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > cleanobsstore=
+  > fbamend=
   > [experimental]
   > evolution=createmarkers
   > EOF
diff --git a/tests/test-fb-hgext-configwarn.t b/tests/test-fb-hgext-configwarn.t
index db226332ff..4efe288f30 100644
--- a/tests/test-fb-hgext-configwarn.t
+++ b/tests/test-fb-hgext-configwarn.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > configwarn=$TESTDIR/../hgext3rd/configwarn.py
+  > configwarn=
   > [configwarn]
   > systemconfigs=diff.git, phases.publish
   > [alias]
diff --git a/tests/test-fb-hgext-copytrace-amend.t b/tests/test-fb-hgext-copytrace-amend.t
index b0b2701b44..ef0d80f2ef 100644
--- a/tests/test-fb-hgext-copytrace-amend.t
+++ b/tests/test-fb-hgext-copytrace-amend.t
@@ -1,8 +1,8 @@
   $ . "$TESTDIR/copytrace.sh"
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > copytrace=$TESTDIR/../hgext3rd/copytrace.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > copytrace=
+  > fbamend=
   > rebase=
   > shelve=
   > [fbamend]
diff --git a/tests/test-fb-hgext-copytrace-errormsg.t b/tests/test-fb-hgext-copytrace-errormsg.t
index d2fe685ea3..f208ab64b4 100644
--- a/tests/test-fb-hgext-copytrace-errormsg.t
+++ b/tests/test-fb-hgext-copytrace-errormsg.t
@@ -2,7 +2,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > rebase=
-  > copytrace=$TESTDIR/../hgext3rd/copytrace.py
+  > copytrace=
   > [experimental]
   > copytrace=off
   > EOF
diff --git a/tests/test-fb-hgext-copytrace.t b/tests/test-fb-hgext-copytrace.t
index df38361eb0..79b055177b 100644
--- a/tests/test-fb-hgext-copytrace.t
+++ b/tests/test-fb-hgext-copytrace.t
@@ -1,7 +1,7 @@
   $ . "$TESTDIR/copytrace.sh"
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > copytrace=$TESTDIR/../hgext3rd/copytrace.py
+  > copytrace=
   > rebase=
   > shelve=
   > [experimental]
diff --git a/tests/test-fb-hgext-crdump.t b/tests/test-fb-hgext-crdump.t
index 22245d41f8..0a1a180507 100644
--- a/tests/test-fb-hgext-crdump.t
+++ b/tests/test-fb-hgext-crdump.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > drawdag=$RUNTESTDIR/drawdag.py
-  > crdump=$TESTDIR/../hgext3rd/crdump.py
+  > crdump=
   > EOF
 
 Create repo
@@ -143,16 +143,16 @@ Test basic dump of two commits
   ...     data = json.loads(f.read())
   ...     outdir = data['output_directory']
   ...     for commit in data['commits']:
-  ...         print "#### commit %s" % commit['node']
-  ...         print open(path.join(outdir, commit['patch_file'])).read()
+  ...         print("#### commit %s" % commit['node'])
+  ...         print(open(path.join(outdir, commit['patch_file'])).read())
   ...         for binfile in commit['binary_files']:
-  ...             print "######## file %s" % binfile['file_name']
+  ...             print("######## file %s" % binfile['file_name'])
   ...             if binfile['old_file'] is not None:
-  ...                 print "######## old"
-  ...                 print open(path.join(outdir, binfile['old_file'])).read().encode('hex')
+  ...                 print("######## old")
+  ...                 print(open(path.join(outdir, binfile['old_file'])).read().encode('hex'))
   ...             if binfile['new_file'] is not None:
-  ...                 print "######## new"
-  ...                 print open(path.join(outdir, binfile['new_file'])).read().encode('hex')
+  ...                 print("######## new")
+  ...                 print(open(path.join(outdir, binfile['new_file'])).read().encode('hex'))
   ...     import shutil
   ...     shutil.rmtree(outdir)
   #### commit 65d913976cc18347138f7b9f5186010d39b39b0f
diff --git a/tests/test-fb-hgext-debugcommitmessage.t b/tests/test-fb-hgext-debugcommitmessage.t
index 1375b28322..f8bceaa727 100644
--- a/tests/test-fb-hgext-debugcommitmessage.t
+++ b/tests/test-fb-hgext-debugcommitmessage.t
@@ -1,7 +1,7 @@
 Set up extension
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > debugcommitmessage = $TESTDIR/../hgext3rd/debugcommitmessage.py
+  > debugcommitmessage=
   > EOF
 
 Set up repo
diff --git a/tests/test-fb-hgext-dialect-show.t b/tests/test-fb-hgext-dialect-show.t
index 231c2f7622..a2b917e6c2 100644
--- a/tests/test-fb-hgext-dialect-show.t
+++ b/tests/test-fb-hgext-dialect-show.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > dialect = $TESTDIR/../hgext3rd/dialect.py
-  > show = $TESTDIR/../hgext3rd/fbshow.py
+  > dialect=
+  > show=$TESTDIR/../hgext/fbshow.py
   > EOF
 
   $ hg help -e show | head -n 1
diff --git a/tests/test-fb-hgext-dirsync-amend.t b/tests/test-fb-hgext-dirsync-amend.t
index 3090416ea0..8a57bcb935 100644
--- a/tests/test-fb-hgext-dirsync-amend.t
+++ b/tests/test-fb-hgext-dirsync-amend.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > dirsync=$TESTDIR/../hgext3rd/dirsync.py
+  > dirsync=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-dirsync.t b/tests/test-fb-hgext-dirsync.t
index 46ebdb6cef..df607f6d92 100644
--- a/tests/test-fb-hgext-dirsync.t
+++ b/tests/test-fb-hgext-dirsync.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > dirsync=$TESTDIR/../hgext3rd/dirsync.py
+  > dirsync=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-drop.t b/tests/test-fb-hgext-drop.t
index 71c3dbef5c..c184b9ce3f 100644
--- a/tests/test-fb-hgext-drop.t
+++ b/tests/test-fb-hgext-drop.t
@@ -11,7 +11,7 @@ TEST: incomplete requirements handling (required extension excluded)
   $ cd a
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > drop = $TESTDIR/../hgext3rd/drop.py
+  > drop=
   > EOF
 
   $ hg drop 1
@@ -23,7 +23,7 @@ SETUP: Properly setup all required extensions
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > rebase=
-  > drop = $TESTDIR/../hgext3rd/drop.py
+  > drop=
   > [experimental]
   > evolution=all
   > EOF
@@ -50,7 +50,7 @@ RESET and SETUP
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > rebase=
-  > drop = $TESTDIR/../hgext3rd/drop.py
+  > drop=
   > [experimental]
   > evolution=all
   > EOF
@@ -87,7 +87,7 @@ RESET and SETUP
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > rebase=
-  > drop = $TESTDIR/../hgext3rd/drop.py
+  > drop=
   > [experimental]
   > evolution=all
   > EOF
@@ -179,7 +179,7 @@ RESET and SETUP
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > rebase=
-  > drop = $TESTDIR/../hgext3rd/drop.py
+  > drop=
   > [experimental]
   > evolution=all
   > EOF
diff --git a/tests/test-fb-hgext-edrecord.t b/tests/test-fb-hgext-edrecord.t
index 659224a46e..30b7507dca 100644
--- a/tests/test-fb-hgext-edrecord.t
+++ b/tests/test-fb-hgext-edrecord.t
@@ -2,7 +2,7 @@
   > [ui]
   > interface=editor
   > [extensions]
-  > edrecord=$TESTDIR/../hgext3rd/edrecord.py
+  > edrecord=
   > __EOF__
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-errorredirect.t b/tests/test-fb-hgext-errorredirect.t
index 634138ddfe..408b750aa4 100644
--- a/tests/test-fb-hgext-errorredirect.t
+++ b/tests/test-fb-hgext-errorredirect.t
@@ -8,7 +8,7 @@
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > errorredirect=$TESTDIR/../hgext3rd/errorredirect.py
+  > errorredirect=
   > crash=$TESTTMP/crash.py
   > EOF
 
diff --git a/tests/test-fb-hgext-extorder.t b/tests/test-fb-hgext-extorder.t
index 4176773f01..06d14856cf 100644
--- a/tests/test-fb-hgext-extorder.t
+++ b/tests/test-fb-hgext-extorder.t
@@ -3,7 +3,7 @@ Set up repository
   $ hg init repo
   $ cd repo
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "extorder = $TESTDIR/../hgext3rd/extorder.py" >> .hg/hgrc
+  $ echo "extorder=" >> .hg/hgrc
   $ echo "rebase =" >> .hg/hgrc
   $ echo "dummyext1 = $TESTDIR/dummyext1.py" >> .hg/hgrc
   $ echo "dummyext2 = $TESTDIR/dummyext2.py" >> .hg/hgrc
@@ -38,4 +38,4 @@ Conflicting deps
   $ hg id > out.txt 2>&1
   [1]
   $ grep MercurialExtOrderException < out.txt
-  hgext_extorder.MercurialExtOrderException: extorder: conflicting extension order
+  hgext.extorder.MercurialExtOrderException: extorder: conflicting extension order
diff --git a/tests/test-fb-hgext-extutil.py b/tests/test-fb-hgext-extutil.py
index 16d77f50fd..61d5f21a6f 100644
--- a/tests/test-fb-hgext-extutil.py
+++ b/tests/test-fb-hgext-extutil.py
@@ -15,7 +15,7 @@ from mercurial import (
 )
 
 if __name__ == '__main__':
-    sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext3rd"))
+    sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext"))
 
 import extutil
 
diff --git a/tests/test-fb-hgext-fastlog.t b/tests/test-fb-hgext-fastlog.t
index 6af754cc00..df99a6321d 100644
--- a/tests/test-fb-hgext-fastlog.t
+++ b/tests/test-fb-hgext-fastlog.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
-  > fastlog=$TESTDIR/../hgext3rd/fastlog.py
+  > tweakdefaults=
+  > fastlog=
   > [fbconduit]
   > host=our.intern.facebook.com
   > protocol=http
diff --git a/tests/test-fb-hgext-fastpartialmatch-bundlerepo.t b/tests/test-fb-hgext-fastpartialmatch-bundlerepo.t
index feb5ea897d..ccb9c06752 100644
--- a/tests/test-fb-hgext-fastpartialmatch-bundlerepo.t
+++ b/tests/test-fb-hgext-fastpartialmatch-bundlerepo.t
@@ -7,7 +7,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
+  > fastpartialmatch=
   > strip=
   > EOF
 
diff --git a/tests/test-fb-hgext-fastpartialmatch-obsolete.t b/tests/test-fb-hgext-fastpartialmatch-obsolete.t
index c32368e49c..68e2062408 100644
--- a/tests/test-fb-hgext-fastpartialmatch-obsolete.t
+++ b/tests/test-fb-hgext-fastpartialmatch-obsolete.t
@@ -7,10 +7,10 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
+  > fastpartialmatch=
   > strip=
   > histedit=
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > [experimental]
   > evolution=createmarkers
   > [ui]
diff --git a/tests/test-fb-hgext-fastpartialmatch-shelve.t b/tests/test-fb-hgext-fastpartialmatch-shelve.t
index 4be557cad1..a94ae8db0f 100644
--- a/tests/test-fb-hgext-fastpartialmatch-shelve.t
+++ b/tests/test-fb-hgext-fastpartialmatch-shelve.t
@@ -7,7 +7,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
+  > fastpartialmatch=
   > shelve=
   > [ui]
   > ssh = python "$TESTDIR/dummyssh"
diff --git a/tests/test-fb-hgext-fastpartialmatch.t b/tests/test-fb-hgext-fastpartialmatch.t
index 732b6b6327..9d582543d1 100644
--- a/tests/test-fb-hgext-fastpartialmatch.t
+++ b/tests/test-fb-hgext-fastpartialmatch.t
@@ -7,7 +7,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
+  > fastpartialmatch=
   > strip=
   > histedit=
   > [ui]
diff --git a/tests/test-fb-hgext-fastverify.t b/tests/test-fb-hgext-fastverify.t
index d00b32f777..c2324c5ce0 100644
--- a/tests/test-fb-hgext-fastverify.t
+++ b/tests/test-fb-hgext-fastverify.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > drawdag=$RUNTESTDIR/drawdag.py
-  > fastverify=$TESTDIR/../hgext3rd/fastverify.py
+  > fastverify=
   > EOF
 
 Turn manifest verification on and off:
diff --git a/tests/test-fb-hgext-fbamend-fold.t b/tests/test-fb-hgext-fbamend-fold.t
index 0379711f78..808a2f74fb 100644
--- a/tests/test-fb-hgext-fbamend-fold.t
+++ b/tests/test-fb-hgext-fbamend-fold.t
@@ -1,8 +1,8 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > [experimental]
   > evolution = createmarkers, allowunstable
diff --git a/tests/test-fb-hgext-fbamend-hiddenoverride.t b/tests/test-fb-hgext-fbamend-hiddenoverride.t
index 338562fcb7..bd892027c1 100644
--- a/tests/test-fb-hgext-fbamend-hiddenoverride.t
+++ b/tests/test-fb-hgext-fbamend-hiddenoverride.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > blackbox=
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > drawdag=$RUNTESTDIR/drawdag.py
   > [experimental]
   > evolution = all
diff --git a/tests/test-fb-hgext-fbamend-hide.t b/tests/test-fb-hgext-fbamend-hide.t
index 4265e8fa01..7aa8a66f71 100644
--- a/tests/test-fb-hgext-fbamend-hide.t
+++ b/tests/test-fb-hgext-fbamend-hide.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > drawdag=$RUNTESTDIR/drawdag.py
   > [experimental]
   > evolution = createmarkers, allowunstable
diff --git a/tests/test-fb-hgext-fbamend-metaedit.t b/tests/test-fb-hgext-fbamend-metaedit.t
index f6bb4d6c48..96b6b1b9d4 100644
--- a/tests/test-fb-hgext-fbamend-metaedit.t
+++ b/tests/test-fb-hgext-fbamend-metaedit.t
@@ -14,7 +14,7 @@
   > unified = 0
   > [extensions]
   > rebase=
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > [experimental]
   > evolution=createmarkers, allowunstable
   > EOF
@@ -268,7 +268,7 @@ make the top commit non-empty
 test histedit compat
 
   $ echo '[extensions]' >> $HGRCPATH
-  $ echo "fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py" >> $HGRCPATH
+  $ echo "fbhistedit=" >> $HGRCPATH
   $ echo "histedit=" >> $HGRCPATH
 
   $ hg export -r .
diff --git a/tests/test-fb-hgext-fbamend-next.t b/tests/test-fb-hgext-fbamend-next.t
index 64464811b5..4feac7324e 100644
--- a/tests/test-fb-hgext-fbamend-next.t
+++ b/tests/test-fb-hgext-fbamend-next.t
@@ -1,8 +1,8 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > [experimental]
   > evolution = createmarkers
diff --git a/tests/test-fb-hgext-fbamend-nextrebase.t b/tests/test-fb-hgext-fbamend-nextrebase.t
index 7fa166e142..cc833b53e2 100644
--- a/tests/test-fb-hgext-fbamend-nextrebase.t
+++ b/tests/test-fb-hgext-fbamend-nextrebase.t
@@ -1,8 +1,8 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > [fbamend]
   > userestack=True
diff --git a/tests/test-fb-hgext-fbamend-noinhibit.t b/tests/test-fb-hgext-fbamend-noinhibit.t
index 6f7939cf4c..bcfe199da8 100644
--- a/tests/test-fb-hgext-fbamend-noinhibit.t
+++ b/tests/test-fb-hgext-fbamend-noinhibit.t
@@ -1,7 +1,7 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > rebase=
   > [experimental]
   > evolution = createmarkers
diff --git a/tests/test-fb-hgext-fbamend-previous.t b/tests/test-fb-hgext-fbamend-previous.t
index 48b4f4c56b..41c66ad064 100644
--- a/tests/test-fb-hgext-fbamend-previous.t
+++ b/tests/test-fb-hgext-fbamend-previous.t
@@ -1,8 +1,8 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > [experimental]
   > evolution = createmarkers
diff --git a/tests/test-fb-hgext-fbamend-rebase.t b/tests/test-fb-hgext-fbamend-rebase.t
index 89e8fb4ca1..60516ca838 100644
--- a/tests/test-fb-hgext-fbamend-rebase.t
+++ b/tests/test-fb-hgext-fbamend-rebase.t
@@ -1,7 +1,7 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > rebase=
   > [experimental]
   > evolution = createmarkers, allowunstable
diff --git a/tests/test-fb-hgext-fbamend-restack.t b/tests/test-fb-hgext-fbamend-restack.t
index bd7d9974ac..130219f298 100644
--- a/tests/test-fb-hgext-fbamend-restack.t
+++ b/tests/test-fb-hgext-fbamend-restack.t
@@ -2,8 +2,8 @@ Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > drawdag=$RUNTESTDIR/drawdag.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > [experimental]
   > evolution.allowdivergence = True
diff --git a/tests/test-fb-hgext-fbamend-split.t b/tests/test-fb-hgext-fbamend-split.t
index b05c330790..d0c4efbcfe 100644
--- a/tests/test-fb-hgext-fbamend-split.t
+++ b/tests/test-fb-hgext-fbamend-split.t
@@ -1,8 +1,8 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > strip=
   > [experimental]
diff --git a/tests/test-fb-hgext-fbamend-to.t b/tests/test-fb-hgext-fbamend-to.t
index f1ac2c7dc6..d3f5265a12 100644
--- a/tests/test-fb-hgext-fbamend-to.t
+++ b/tests/test-fb-hgext-fbamend-to.t
@@ -1,10 +1,10 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > debuginhibit=$TESTDIR/../hgext3rd/debuginhibit.py
-  > directaccess=$TESTDIR/../hgext3rd/directaccess.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > debuginhibit=
+  > directaccess=
+  > fbamend=
+  > inhibit=
   > histedit=
   > rebase=
   > [experimental]
diff --git a/tests/test-fb-hgext-fbamend-userestack.t b/tests/test-fb-hgext-fbamend-userestack.t
index 73ac553e17..4de17ad845 100644
--- a/tests/test-fb-hgext-fbamend-userestack.t
+++ b/tests/test-fb-hgext-fbamend-userestack.t
@@ -1,11 +1,11 @@
 Set up test environment.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > strip=
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > [experimental]
   > evolution = createmarkers
   > [fbamend]
diff --git a/tests/test-fb-hgext-fbamend.t b/tests/test-fb-hgext-fbamend.t
index 8a5a7098c7..22a2ac4aef 100644
--- a/tests/test-fb-hgext-fbamend.t
+++ b/tests/test-fb-hgext-fbamend.t
@@ -2,7 +2,7 @@ Test functionality is present
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > rebase=
   > EOF
   $ mkcommit() {
@@ -205,7 +205,7 @@ Test that unbookmarked re-amends work well
 Test interaction with histedit
 
   $ echo '[extensions]' >> $HGRCPATH
-  $ echo "fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py" >> $HGRCPATH
+  $ echo "fbhistedit=" >> $HGRCPATH
   $ echo "histedit=" >> $HGRCPATH
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -307,7 +307,7 @@ Test that the extension disables itself when evolution is enabled
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > EOF
 
 noisy warning during amend
@@ -474,7 +474,7 @@ Test hg amend works with a logfile
 Test fbamend with inhibit
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > inhibit=
   > EOF
   $ cd ..
   $ hg init inhibitrepo
@@ -536,7 +536,7 @@ Prepare a repo for unamend testing
   $ cd unamendrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > [experimental]
   > evolution=createmarkers
   > EOF
@@ -592,7 +592,7 @@ Make sure that unamend does not work without inhibit
 Make sure that unamend works as expected with inhibit
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > inhibit=
   > EOF
   $ hg unamend
 
diff --git a/tests/test-fb-hgext-fbconduit.t b/tests/test-fb-hgext-fbconduit.t
index 327757aedd..00caf6c6ea 100644
--- a/tests/test-fb-hgext-fbconduit.t
+++ b/tests/test-fb-hgext-fbconduit.t
@@ -10,7 +10,7 @@ Basic functionality.
   $ cd basic
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > fbconduit = $TESTDIR/../hgext3rd/fbconduit.py
+  > fbconduit=
   > [fbconduit]
   > reponame = basic
   > host = localhost:$CONDUIT_PORT
@@ -48,7 +48,7 @@ Test with one backing repos specified.
   $ hg init single_backingrepo
   $ cd single_backingrepo
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
+  $ echo "fbconduit=" >> .hg/hgrc
   $ echo "[fbconduit]" >> .hg/hgrc
   $ echo "reponame = single" >> .hg/hgrc
   $ echo "backingrepos = single_src" >> .hg/hgrc
@@ -75,7 +75,7 @@ Test with multiple backing repos specified.
   $ hg init backingrepos
   $ cd backingrepos
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
+  $ echo "fbconduit=" >> .hg/hgrc
   $ echo "[fbconduit]" >> .hg/hgrc
   $ echo "reponame = multiple" >> .hg/hgrc
   $ echo "backingrepos = src_a src_b src_c" >> .hg/hgrc
@@ -136,7 +136,7 @@ Test with a bad server port, where we get connection refused errors.
   $ hg init errortest
   $ cd errortest
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
+  $ echo "fbconduit=" >> .hg/hgrc
   $ echo "[fbconduit]" >> .hg/hgrc
   $ echo "reponame = errortest" >> .hg/hgrc
   $ echo "host = localhost:9" >> .hg/hgrc
diff --git a/tests/test-fb-hgext-fbhistedit-exec-obsolete.t b/tests/test-fb-hgext-fbhistedit-exec-obsolete.t
index c43ae4bfaa..a1c708d9e1 100644
--- a/tests/test-fb-hgext-fbhistedit-exec-obsolete.t
+++ b/tests/test-fb-hgext-fbhistedit-exec-obsolete.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-fbhistedit-exec.t b/tests/test-fb-hgext-fbhistedit-exec.t
index 036444e212..b8698ba35c 100644
--- a/tests/test-fb-hgext-fbhistedit-exec.t
+++ b/tests/test-fb-hgext-fbhistedit-exec.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > EOF
@@ -195,7 +195,6 @@ retry should try to execute the command again and continue if succeeded
   > exec exit 2
   > edit 652413bf663e f
   > EOF
-  [1]
 
   $ hg histedit --retry
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -346,7 +345,7 @@ Test that we can recover exec with fbamend on
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > [experimental]
   > evolution=createmarkers, allowunstable
   > EOF
diff --git a/tests/test-fb-hgext-fbhistedit-graft.t b/tests/test-fb-hgext-fbhistedit-graft.t
index 39072a8fd5..4f39570a95 100644
--- a/tests/test-fb-hgext-fbhistedit-graft.t
+++ b/tests/test-fb-hgext-fbhistedit-graft.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > [alias]
@@ -50,7 +50,6 @@ Use histedit to graft an extra commit into current history
   > graft 581a2eefdc84
   > pick f9d2e574dc58
   > EOF
-  [1]
 
   $ hg tglog
   @  7:fc9a25c1b8afb917f8e3dacad873f0d0bea14a96:draft 'c'
diff --git a/tests/test-fb-hgext-fbhistedit-json.t b/tests/test-fb-hgext-fbhistedit-json.t
index 310c4aa1ef..2495c0b32a 100644
--- a/tests/test-fb-hgext-fbhistedit-json.t
+++ b/tests/test-fb-hgext-fbhistedit-json.t
@@ -4,7 +4,7 @@ Tests JSON Input support for histedit
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > [experimental]
diff --git a/tests/test-fb-hgext-fbhistedit-rebase-interactive.t b/tests/test-fb-hgext-fbhistedit-rebase-interactive.t
index 6d4db7d160..7bf463a7c2 100644
--- a/tests/test-fb-hgext-fbhistedit-rebase-interactive.t
+++ b/tests/test-fb-hgext-fbhistedit-rebase-interactive.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-fbhistedit-show-plan.t b/tests/test-fb-hgext-fbhistedit-show-plan.t
index cfb45c321f..ddfe516396 100644
--- a/tests/test-fb-hgext-fbhistedit-show-plan.t
+++ b/tests/test-fb-hgext-fbhistedit-show-plan.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-fbhistedit-stop-obsolete.t b/tests/test-fb-hgext-fbhistedit-stop-obsolete.t
index e40fc3669f..26ee97482e 100644
--- a/tests/test-fb-hgext-fbhistedit-stop-obsolete.t
+++ b/tests/test-fb-hgext-fbhistedit-stop-obsolete.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > histedit=
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-fbhistedit-stop.t b/tests/test-fb-hgext-fbhistedit-stop.t
index b2cff8d239..da4589ef58 100644
--- a/tests/test-fb-hgext-fbhistedit-stop.t
+++ b/tests/test-fb-hgext-fbhistedit-stop.t
@@ -8,10 +8,10 @@ Setup
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > histedit=
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > inhibit=
+  > fbamend=
   > rebase=
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > fbhistedit=
   > [experimental]
   > evolution = createmarkers
   > EOF
diff --git a/tests/test-fb-hgext-fixcorrupt.t b/tests/test-fb-hgext-fixcorrupt.t
index 6dd74bb420..7faf375122 100644
--- a/tests/test-fb-hgext-fixcorrupt.t
+++ b/tests/test-fb-hgext-fixcorrupt.t
@@ -10,7 +10,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > noinline=$TESTTMP/noinline.py
-  > fixcorrupt=$TESTDIR/../hgext3rd/fixcorrupt.py
+  > fixcorrupt=
   > EOF
 
   $ rebuildrepo() {
diff --git a/tests/test-fb-hgext-fold-undo.t b/tests/test-fb-hgext-fold-undo.t
index 58fd900d43..ac026e4428 100644
--- a/tests/test-fb-hgext-fold-undo.t
+++ b/tests/test-fb-hgext-fold-undo.t
@@ -2,9 +2,9 @@ Set up test environment.
 This test confirms cacheinvalidation in hg fold.
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
-  > undo=$TESTDIR/../hgext3rd/undo.py
+  > fbamend=
+  > inhibit=
+  > undo=
   > rebase=
   > [experimental]
   > evolution = createmarkers, allowunstable
diff --git a/tests/test-fb-hgext-generic-bisect.py b/tests/test-fb-hgext-generic-bisect.py
index 597ab024cc..0d37d1d371 100644
--- a/tests/test-fb-hgext-generic-bisect.py
+++ b/tests/test-fb-hgext-generic-bisect.py
@@ -51,6 +51,6 @@ class BisectTests(unittest.TestCase):
         self.assertEqual(bisect(0, len(array) - 1, comp, value), result)
 
 if __name__ == '__main__':
-    sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext3rd"))
+    sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext"))
     from generic_bisect import bisect
     silenttestrunner.main(__name__)
diff --git a/tests/test-fb-hgext-git-getmeta.t b/tests/test-fb-hgext-git-getmeta.t
index f636f979a3..93a4a29c57 100644
--- a/tests/test-fb-hgext-git-getmeta.t
+++ b/tests/test-fb-hgext-git-getmeta.t
@@ -1,8 +1,8 @@
 #testcases onlymapdelta.true onlymapdelta.false
 
   $ echo "[extensions]" >> $HGRCPATH
-  $ echo "gitlookup = $TESTDIR/../hgext3rd/gitlookup.py" >> $HGRCPATH
-  $ echo "gitrevset = $TESTDIR/../hgext3rd/gitrevset.py" >> $HGRCPATH
+  $ echo "gitlookup=" >> $HGRCPATH
+  $ echo "gitrevset=" >> $HGRCPATH
   $ echo "strip = " >> $HGRCPATH
   $ echo "[ui]" >> $HGRCPATH
   $ echo 'ssh = python "$RUNTESTDIR/dummyssh"' >> $HGRCPATH
diff --git a/tests/test-fb-hgext-githelp.t b/tests/test-fb-hgext-githelp.t
index b2d9118ece..c25faf8f2f 100644
--- a/tests/test-fb-hgext-githelp.t
+++ b/tests/test-fb-hgext-githelp.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > githelp=$TESTDIR/../hgext3rd/githelp.py
+  > githelp=
   > EOF
 
   $ hg init repo
@@ -277,6 +277,6 @@ githelp for git blame (tweakdefaults disabled)
   hg annotate -udl
 
 githelp for git blame (tweakdefaults enabled)
-  $ hg --config extensions.tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py githelp -- git blame
+  $ hg --config extensions.tweakdefaults= githelp -- git blame
   hg annotate -pudl
 
diff --git a/tests/test-fb-hgext-grepdiff.t b/tests/test-fb-hgext-grepdiff.t
index 8c8978233f..63dd021437 100644
--- a/tests/test-fb-hgext-grepdiff.t
+++ b/tests/test-fb-hgext-grepdiff.t
@@ -1,6 +1,6 @@
   $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
   $ echo "[extensions]" >> $HGRCPATH
-  $ echo "grepdiff = $TESTDIR/../hgext3rd/grepdiff.py" >> $HGRCPATH
+  $ echo "grepdiff=" >> $HGRCPATH
 
 Setup repo
 
diff --git a/tests/test-fb-hgext-grpcheck.t b/tests/test-fb-hgext-grpcheck.t
index d01d20827e..16aaa3daa7 100644
--- a/tests/test-fb-hgext-grpcheck.t
+++ b/tests/test-fb-hgext-grpcheck.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > grpcheck = $TESTDIR/../hgext3rd/grpcheck.py
+  > grpcheck=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-hiddenerror.t b/tests/test-fb-hgext-hiddenerror.t
index caf78256d4..074103dc9a 100644
--- a/tests/test-fb-hgext-hiddenerror.t
+++ b/tests/test-fb-hgext-hiddenerror.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > hiddenerror=$TESTDIR/../hgext3rd/hiddenerror.py
+  > hiddenerror=
   > [experimental]
   > evolution=all
   > EOF
diff --git a/tests/test-fb-hgext-inhibit.t b/tests/test-fb-hgext-inhibit.t
index 9f9963e523..5c082347fc 100644
--- a/tests/test-fb-hgext-inhibit.t
+++ b/tests/test-fb-hgext-inhibit.t
@@ -3,7 +3,7 @@
   > evolution=createmarkers
   > [extensions]
   > drawdag=$RUNTESTDIR/drawdag.py
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > inhibit=
   > EOF
 
   $ hg init inhibit
@@ -124,7 +124,7 @@ Test date is set correctly
   $ hg update -q G
   $ echo 1 >> G
   $ hg commit --amend -m G1 --config devel.default-date='123456 0'
-  $ hg unamend --config extensions.fbamend=$TESTDIR/../hgext3rd/fbamend
+  $ hg unamend --config extensions.fbamend=
   $ hg debugobsolete | tail -1
   b7e6ea8355346dbbedcb23188c3a5de400e780ae cf43ad9da869111bee585c5475aefe61f6f74649 0 (Fri Jan 02 10:17:37 1970 +0000) {'ef1': '9', 'user': 'test'}
   $ echo 2 >> G
@@ -136,7 +136,7 @@ Do not use a mocked date
   > %unset default-date
   > EOF
   $ hg commit --amend -m G2
-  $ hg unamend --config extensions.fbamend=$TESTDIR/../hgext3rd/fbamend
+  $ hg unamend --config extensions.fbamend=
   $ hg debugobsolete | tail -1
   51313a3d2b65bd2cbc4828a7309af84eb5914bdb cf43ad9da869111bee585c5475aefe61f6f74649 0 (*) {'ef1': '9', 'user': 'test'} (glob)
   $ hg debugobsolete | tail -1 | grep ' 1970 +0000'
diff --git a/tests/test-fb-hgext-lfs-pointer.py b/tests/test-fb-hgext-lfs-pointer.py
index 89848080d8..5280e1f636 100644
--- a/tests/test-fb-hgext-lfs-pointer.py
+++ b/tests/test-fb-hgext-lfs-pointer.py
@@ -6,7 +6,7 @@ import sys
 # make it runnable using python directly without run-tests.py
 sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
 
-from hgext3rd.lfs import pointer
+from hgext.lfs import pointer
 
 def tryparse(text):
     r = {}
diff --git a/tests/test-fb-hgext-lfs-test-server.t b/tests/test-fb-hgext-lfs-test-server.t
index 628ff5549f..ebdb0c6bf5 100644
--- a/tests/test-fb-hgext-lfs-test-server.t
+++ b/tests/test-fb-hgext-lfs-test-server.t
@@ -11,7 +11,7 @@ Require lfs-test-server (https://github.com/git-lfs/lfs-test-server)
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > lfs=$TESTDIR/../hgext3rd/lfs
+  > lfs=
   > [lfs]
   > url=http://foo:bar@$LFS_HOST/
   > threshold=1
diff --git a/tests/test-fb-hgext-lfs.t b/tests/test-fb-hgext-lfs.t
index 5a5658305f..50d8457603 100644
--- a/tests/test-fb-hgext-lfs.t
+++ b/tests/test-fb-hgext-lfs.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > lfs=$TESTDIR/../hgext3rd/lfs/
+  > lfs=
   > [lfs]
   > threshold=1000B
   > EOF
@@ -416,7 +416,7 @@
   $ cd repo10
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > lfs=$TESTDIR/../hgext3rd/lfs/
+  > lfs=
   > [lfs]
   > threshold=1
   > EOF
diff --git a/tests/test-fb-hgext-merge-conflictinfo.t b/tests/test-fb-hgext-merge-conflictinfo.t
index 6939e38002..4853e828db 100644
--- a/tests/test-fb-hgext-merge-conflictinfo.t
+++ b/tests/test-fb-hgext-merge-conflictinfo.t
@@ -4,7 +4,7 @@
   $ hg init
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > conflictinfo=$TESTDIR/../hgext3rd/conflictinfo.py
+  > conflictinfo=
   > EOF
 
 2) Can't run dumpjson outside a conflict
@@ -104,7 +104,7 @@ Setup
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
-  > conflictinfo=$TESTDIR/../hgext3rd/conflictinfo.py
+  > conflictinfo=
   > EOF
 
   $ reset() {
diff --git a/tests/test-fb-hgext-mergedriver.t b/tests/test-fb-hgext-mergedriver.t
index f69681f12f..a9119d7fe5 100644
--- a/tests/test-fb-hgext-mergedriver.t
+++ b/tests/test-fb-hgext-mergedriver.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > mergedriver=$TESTDIR/../hgext3rd/mergedriver.py
+  > mergedriver=
   > EOF
 
 basic merge driver: just lists out files and contents, doesn't resolve any files
diff --git a/tests/test-fb-hgext-morecolors.t b/tests/test-fb-hgext-morecolors.t
index 0e7cf21ce7..dceeeddf12 100644
--- a/tests/test-fb-hgext-morecolors.t
+++ b/tests/test-fb-hgext-morecolors.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > morecolors=$TESTDIR/../hgext3rd/morecolors.py
+  > morecolors=
   > [ui]
   > color=always
   > [color]
diff --git a/tests/test-fb-hgext-morestatus.t b/tests/test-fb-hgext-morestatus.t
index 3ed8684965..5cf953816f 100644
--- a/tests/test-fb-hgext-morestatus.t
+++ b/tests/test-fb-hgext-morestatus.t
@@ -2,11 +2,11 @@
   > [morestatus]
   > show=True
   > [extensions]
-  > morestatus=$TESTDIR/../hgext3rd/morestatus.py
-  > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
+  > morestatus=
+  > fbhistedit=
   > histedit=
   > rebase=
-  > reset=$TESTDIR/../hgext3rd/reset.py
+  > reset=
   > EOF
   $ cat >> $TESTTMP/breakupdate.py << EOF
   > import sys
diff --git a/tests/test-fb-hgext-myparent.t b/tests/test-fb-hgext-myparent.t
index b3e0af7769..50a2d2f71c 100644
--- a/tests/test-fb-hgext-myparent.t
+++ b/tests/test-fb-hgext-myparent.t
@@ -4,7 +4,7 @@ Setup
   $ export PYTHONPATH
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > myparent=$TESTDIR/../hgext3rd/myparent.py
+  > myparent=
   > EOF
   $ hg init repo
   $ cd repo
diff --git a/tests/test-fb-hgext-nointerrupt.t b/tests/test-fb-hgext-nointerrupt.t
index ac878963fc..44af266470 100644
--- a/tests/test-fb-hgext-nointerrupt.t
+++ b/tests/test-fb-hgext-nointerrupt.t
@@ -45,7 +45,7 @@ Test ctrl-c
   [124]
 
   $ cat >> $HGRCPATH << EOF
-  > nointerrupt = $TESTDIR/../hgext3rd/nointerrupt.py
+  > nointerrupt=
   > [alias]
   > slumber = sleep
   > [nointerrupt]
diff --git a/tests/test-fb-hgext-obsshelve.t b/tests/test-fb-hgext-obsshelve.t
index 3106a5f458..f04abb7e67 100644
--- a/tests/test-fb-hgext-obsshelve.t
+++ b/tests/test-fb-hgext-obsshelve.t
@@ -4,7 +4,7 @@
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > mq =
-  > obsshelve=$TESTDIR/../hgext3rd/obsshelve.py
+  > obsshelve=
   > [defaults]
   > diff = --nodates --git
   > qnew = --date '0 0'
@@ -1058,7 +1058,7 @@ Wreak havoc on the unshelve process
   $ rm .hg/unshelverebasestate
   $ hg unshelve --abort
   unshelve of 'default' aborted
-  abort: (No such file or directory|The system cannot find the file specified) (re)
+  abort: $ENOENT$
   [255]
 Can the user leave the current state?
   $ hg up -C .
@@ -1564,7 +1564,7 @@ Unshelving a stripped commit aborts with an explanatory message
   [255]
 
 Enabling both shelve and obsshelve should not be allowed
-  $ hg --config extensions.obsshelve=$TESTDIR/../hgext3rd/obsshelve.py --config extensions.shelve= log -r .
+  $ hg --config extensions.obsshelve= --config extensions.shelve= log -r .
   extension 'shelve' overrides commands: * (glob)
   abort: shelve must be disabled when obsshelve is enabled
   [255]
diff --git a/tests/test-fb-hgext-ownercheck.t b/tests/test-fb-hgext-ownercheck.t
index a4e3e61194..f58e1ad26c 100644
--- a/tests/test-fb-hgext-ownercheck.t
+++ b/tests/test-fb-hgext-ownercheck.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > ownercheck=$TESTDIR/../hgext3rd/ownercheck.py
+  > ownercheck=
   > EOF
 
 ownercheck does not prevent normal hg operations
diff --git a/tests/test-fb-hgext-patchpython.py b/tests/test-fb-hgext-patchpython.py
index 04e87e9396..f3a521f7b4 100644
--- a/tests/test-fb-hgext-patchpython.py
+++ b/tests/test-fb-hgext-patchpython.py
@@ -11,7 +11,7 @@ except ImportError:
     import socketserver as SocketServer
 
 # Make sure we use patchpython.py in this repo, unaffected by PYTHONPATH
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../hgext3rd'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../hgext'))
 import patchpython
 
 assert patchpython # pass pyflakes "import but unused" check
diff --git a/tests/test-fb-hgext-perftweaks-remotenames.t b/tests/test-fb-hgext-perftweaks-remotenames.t
index 0fa98c03a8..b9a56a1ab0 100644
--- a/tests/test-fb-hgext-perftweaks-remotenames.t
+++ b/tests/test-fb-hgext-perftweaks-remotenames.t
@@ -4,8 +4,8 @@
   > [ui]
   > ssh=python "$TESTDIR/dummyssh"
   > [extensions]
-  > perftweaks=$TESTDIR/../hgext3rd/perftweaks.py
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > perftweaks=
+  > tweakdefaults=
   > remotenames=
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-perftweaks.t b/tests/test-fb-hgext-perftweaks.t
index 6e1fda253e..2c66a09f68 100644
--- a/tests/test-fb-hgext-perftweaks.t
+++ b/tests/test-fb-hgext-perftweaks.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > drawdag=$RUNTESTDIR/drawdag.py
-  > perftweaks=$TESTDIR/../hgext3rd/perftweaks.py
+  > perftweaks=
   > EOF
 
 Test disabling the tag cache
@@ -191,7 +191,7 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
   > key.sparse_profiles=sparse_profiles
   > filepath = $LOGDIR/samplingpath.txt
   > [extensions]
-  > sampling=$TESTDIR/../hgext3rd/sampling.py
+  > sampling=
   > EOF
   $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
   $ export PYTHONPATH
@@ -202,12 +202,12 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
   ...     data = f.read()
   >>> for record in data.strip("\0").split("\0"):
   ...     parsedrecord = json.loads(record)
-  ...     print '{0}: {1}'.format(parsedrecord['category'],
-  ...                             parsedrecord['data']['dirstate_size'])
+  ...     print('{0}: {1}'.format(parsedrecord['category'],
+  ...                             parsedrecord['data']['dirstate_size']))
   dirstate_size: 1
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
   $ cat >> profile_base << EOF
   > [include]
@@ -225,7 +225,7 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
   >>> for record in data.strip("\0").split("\0"):
   ...     parsedrecord = json.loads(record)
   ...     if parsedrecord['category'] == 'sparse_profiles':
-  ...         print 'active_profiles:', parsedrecord['data']['active_profiles']
+  ...         print('active_profiles:', parsedrecord['data']['active_profiles'])
   active_profiles: 
   active_profiles: 
   active_profiles: profile_base,profile_extended
diff --git a/tests/test-fb-hgext-phrevset-local.t b/tests/test-fb-hgext-phrevset-local.t
index eae1a5496a..095d7db197 100644
--- a/tests/test-fb-hgext-phrevset-local.t
+++ b/tests/test-fb-hgext-phrevset-local.t
@@ -1,7 +1,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > phrevset=$TESTDIR/../hgext3rd/phrevset.py
+  > phrevset=
   > EOF
   $ hg init repo
   $ cd repo
diff --git a/tests/test-fb-hgext-pull-createmarkers-hide-later.t b/tests/test-fb-hgext-pull-createmarkers-hide-later.t
index b488f49385..38253a48b3 100644
--- a/tests/test-fb-hgext-pull-createmarkers-hide-later.t
+++ b/tests/test-fb-hgext-pull-createmarkers-hide-later.t
@@ -14,13 +14,13 @@ Test that hg pull creates obsolescence markers for landed diffs
   > evolution= createmarkers
   > rebaseskipobsolete=True
   > [extensions]
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > inhibit=
+  > fbamend=
   > strip=
   > rebase=
   > remotenames =
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
-  > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
+  > pushrebase=
+  > pullcreatemarkers=
   > [fbamend]
   > safestrip=false
   > [remotenames]
diff --git a/tests/test-fb-hgext-pull-createmarkers.t b/tests/test-fb-hgext-pull-createmarkers.t
index 18966cb0e5..765f92be15 100644
--- a/tests/test-fb-hgext-pull-createmarkers.t
+++ b/tests/test-fb-hgext-pull-createmarkers.t
@@ -14,13 +14,13 @@ Test that hg pull creates obsolescence markers for landed diffs
   > evolution= createmarkers
   > rebaseskipobsolete=True
   > [extensions]
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > inhibit=
+  > fbamend=
   > strip=
   > rebase=
   > remotenames =
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
-  > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
+  > pushrebase=
+  > pullcreatemarkers=
   > [remotenames]
   > allownonfastforward=True
   > [fbamend]
diff --git a/tests/test-fb-hgext-pushrebase-protection.t b/tests/test-fb-hgext-pushrebase-protection.t
index 1d7c8ebf0f..f7e1e03667 100644
--- a/tests/test-fb-hgext-pushrebase-protection.t
+++ b/tests/test-fb-hgext-pushrebase-protection.t
@@ -17,7 +17,7 @@ Setup pushrebase required repo
   $ cd server
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > [pushrebase]
   > blocknonpushrebase = True
   > EOF
@@ -54,7 +54,7 @@ Non-pushrebase pushes should be rejected
 
 Pushrebase pushes should be allowed
 
-  $ hg push --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
+  $ hg push --config "extensions.pushrebase=" --to master -B master
   pushing to $TESTTMP/server (glob)
   searching for changes
   pushing 1 changeset:
diff --git a/tests/test-fb-hgext-pushrebase-remotenames.t b/tests/test-fb-hgext-pushrebase-remotenames.t
index 2adbef1551..6acca0373e 100644
--- a/tests/test-fb-hgext-pushrebase-remotenames.t
+++ b/tests/test-fb-hgext-pushrebase-remotenames.t
@@ -16,7 +16,7 @@ Set up server repository
   $ cd server
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames = !
   > [experimental]
   > bundle2-exp=True
@@ -42,7 +42,7 @@ Test that pushing to a remotename gets rebased
   $ cat >> .hg/hgrc << EOF
   > [extensions]
   > remotenames =
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > [remotenames]
   > allownonfastforward=True
   > [experimental]
@@ -242,7 +242,7 @@ Test force pushes
   $ cd forcepushserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames = !
   > [experimental]
   > bundle2-exp=True
@@ -258,7 +258,7 @@ Test force pushes
   $ cd ../forcepushclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames =
   > [remotenames]
   > allownonfastforward=True
@@ -297,7 +297,7 @@ Test 'hg push' with a tracking bookmark
   $ cd trackingserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames = !
   > [experimental]
   > bundle2-exp=True
@@ -309,7 +309,7 @@ Test 'hg push' with a tracking bookmark
   $ cd trackingclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames =
   > [remotenames]
   > allownonfastforward=True
@@ -359,7 +359,7 @@ Test push --to to a repo without pushrebase on (i.e. the default remotenames beh
   $ cd newclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > remotenames =
   > [experimental]
   > bundle2-exp=True
@@ -394,7 +394,7 @@ that requires pushrebase.
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > remotenames =
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > [experimental]
   > bundle2-exp=True
   > [pushrebase]
diff --git a/tests/test-fb-hgext-pushrebase.t b/tests/test-fb-hgext-pushrebase.t
index 44f9650e31..a9bb8c0f7e 100644
--- a/tests/test-fb-hgext-pushrebase.t
+++ b/tests/test-fb-hgext-pushrebase.t
@@ -529,7 +529,7 @@ Test that the prepushrebase hook can run against the bundle repo
   > [hooks]
   > prepushrebase = $TESTTMP/prerebase.sh
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > [experimental]
   > bundle2lazylocking = True
   > EOF
@@ -549,7 +549,7 @@ Test that the prepushrebase hook can run against the bundle repo
   $ cd prepushrebaseclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ touch b && hg add b && hg commit -qm b
   $ hg push --to master
@@ -562,7 +562,7 @@ Test that the prepushrebase hook can run against the bundle repo
   remote: summary:     b
   remote: 
   remote: Checking if lock exists (it should not):
-  remote: ls: *.hg/store/lock*: No such file or directory (glob)
+  remote: ls: *.hg/store/lock*: $ENOENT$ (glob)
   remote: prepushrebase hook exited with status * (glob)
   abort: push failed on remote
   [255]
@@ -586,7 +586,7 @@ Test that hooks are fired with the correct variables
   > prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase
   > prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ touch file && hg ci -Aqm initial
   pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob)
@@ -604,7 +604,7 @@ Test that hooks are fired with the correct variables
   $ cd hookclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ hg update master
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -640,7 +640,7 @@ Test date rewriting
   $ cd rewritedate
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > [pushrebase]
   > rewritedates = True
   > EOF
@@ -655,7 +655,7 @@ Test date rewriting
   $ cd rewritedateclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -727,7 +727,7 @@ Test pushrebase on merge commit where master is on the p2 side
   $ cd p2mergeserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ echo a >> a && hg commit -Aqm 'add a'
   $ hg bookmark master
@@ -737,7 +737,7 @@ Test pushrebase on merge commit where master is on the p2 side
   $ cd p2mergeclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ hg up -q null
   $ echo b >> b && hg commit -Aqm 'add b'
@@ -783,7 +783,7 @@ Test force pushes
   $ cd forcepushserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ echo a > a && hg commit -Aqm a
   $ cd ..
@@ -797,7 +797,7 @@ Test force pushes
   $ cd ../forcepushclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -829,7 +829,7 @@ Make sure that no hg-bundle-* files left
 (the '|| true' and '*' prefix is because ls has different behavior on linux
 and osx)
   $ ls ../server/.hg/hg-bundle-* || true
-  ls: *../server/.hg/hg-bundle-*: No such file or directory (glob)
+  ls: *../server/.hg/hg-bundle-*: $ENOENT$ (glob)
 
 Server with obsstore disabled can still send obsmarkers useful to client, and
 phase is updated correctly with the marker information.
@@ -844,7 +844,7 @@ phase is updated correctly with the marker information.
   $ cd server1
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
   $ echo a > a
   $ hg commit -m a -A a -q
@@ -904,7 +904,7 @@ Push a file-copy changeset and the copy source gets modified by others:
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
+  > pushrebase=
   > EOF
 
   $ echo 1 > A
diff --git a/tests/test-fb-hgext-rage.t b/tests/test-fb-hgext-rage.t
index 878e5e1a67..5ae3baa3d0 100644
--- a/tests/test-fb-hgext-rage.t
+++ b/tests/test-fb-hgext-rage.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > rage=$TESTDIR/../hgext3rd/rage.py
+  > rage=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-remoteid-print.t b/tests/test-fb-hgext-remoteid-print.t
index 3deb980849..e9c6f9b102 100644
--- a/tests/test-fb-hgext-remoteid-print.t
+++ b/tests/test-fb-hgext-remoteid-print.t
@@ -14,7 +14,7 @@
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > remoteid=$TESTDIR/../hgext3rd/remoteid.py
+  > remoteid=
   > [remotefilelog]
   > server=True
   > EOF
diff --git a/tests/test-fb-hgext-reset-remotenames.t b/tests/test-fb-hgext-reset-remotenames.t
index af3a51fd00..c404bf5a73 100644
--- a/tests/test-fb-hgext-reset-remotenames.t
+++ b/tests/test-fb-hgext-reset-remotenames.t
@@ -1,7 +1,7 @@
   $ . $TESTDIR/require-ext.sh remotenames
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > reset=$TESTDIR/../hgext3rd/reset.py
+  > reset=
   > remotenames=
   > EOF
 
diff --git a/tests/test-fb-hgext-reset.t b/tests/test-fb-hgext-reset.t
index f3e96e749a..a284f88e44 100644
--- a/tests/test-fb-hgext-reset.t
+++ b/tests/test-fb-hgext-reset.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > reset=$TESTDIR/../hgext3rd/reset.py
+  > reset=
   > EOF
 
   $ hg init repo
@@ -153,7 +153,7 @@ Reset + Obsolete tests
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > rebase=
   > [experimental]
   > evolution=all
@@ -196,8 +196,8 @@ Reset + Inhibit tests, with inhibit reset revives the same commit
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > fbamend=
+  > inhibit=
   > rebase=
   > EOF
 
diff --git a/tests/test-fb-hgext-sampling.t b/tests/test-fb-hgext-sampling.t
index be7f51e7b8..f34001690f 100644
--- a/tests/test-fb-hgext-sampling.t
+++ b/tests/test-fb-hgext-sampling.t
@@ -40,7 +40,7 @@ logged
   > [sampling]
   > key.commit=commit_table
   > [extensions]
-  > sampling=$TESTDIR/../hgext3rd/sampling.py
+  > sampling=
   > EOF
   $ LOGDIR=`pwd`/logs
   $ mkdir $LOGDIR
diff --git a/tests/test-fb-hgext-show.t b/tests/test-fb-hgext-show.t
index bf86e0909a..28df3f3640 100644
--- a/tests/test-fb-hgext-show.t
+++ b/tests/test-fb-hgext-show.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > show=$TESTDIR/../hgext3rd/fbshow.py
+  > show=$TESTDIR/../hgext/fbshow.py
   > EOF
 
 We assume that log basically works (it has its own tests). This just covers uses
diff --git a/tests/test-fb-hgext-sigtrace.t b/tests/test-fb-hgext-sigtrace.t
index 97f20f0f39..6a48a6f8f2 100644
--- a/tests/test-fb-hgext-sigtrace.t
+++ b/tests/test-fb-hgext-sigtrace.t
@@ -13,7 +13,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > sigtrace=$TESTDIR/../hgext3rd/sigtrace.py
+  > sigtrace=
   > signal=$TESTTMP/signal.py
   > [sigtrace]
   > pathformat=$TESTTMP/dump-%(pid)s-%(time)s.log
diff --git a/tests/test-fb-hgext-simplecache.t b/tests/test-fb-hgext-simplecache.t
index beed963f45..93cb37e4a7 100644
--- a/tests/test-fb-hgext-simplecache.t
+++ b/tests/test-fb-hgext-simplecache.t
@@ -4,7 +4,7 @@ Setup the extension
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > simplecache=$TESTDIR/../hgext3rd/simplecache.py
+  > simplecache=
   > [simplecache]
   > cachedir=$TESTTMP/hgsimplecache
   > caches=memcache
diff --git a/tests/test-fb-hgext-smartlog-inhibit.t b/tests/test-fb-hgext-smartlog-inhibit.t
index 63e7aa3c1a..4b6b4ee491 100644
--- a/tests/test-fb-hgext-smartlog-inhibit.t
+++ b/tests/test-fb-hgext-smartlog-inhibit.t
@@ -1,8 +1,8 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
-  > smartlog=$TESTDIR/../hgext3rd/smartlog.py
+  > fbamend=
+  > inhibit=
+  > smartlog=
   > [experimental]
   > evolution = createmarkers
   > EOF
diff --git a/tests/test-fb-hgext-smartlog-obsolete.t b/tests/test-fb-hgext-smartlog-obsolete.t
index 68ae9609b8..e565c703aa 100644
--- a/tests/test-fb-hgext-smartlog-obsolete.t
+++ b/tests/test-fb-hgext-smartlog-obsolete.t
@@ -1,11 +1,11 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > histedit=
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > inhibit=
   > rebase=
-  > smartlog=$TESTDIR/../hgext3rd/smartlog.py
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > smartlog=
+  > tweakdefaults=
   > [tweakdefaults]
   > histeditkeepdate = true
   > [experimental]
diff --git a/tests/test-fb-hgext-smartlog-remotenames.t b/tests/test-fb-hgext-smartlog-remotenames.t
index 5f6cdcdc4a..953f92a299 100644
--- a/tests/test-fb-hgext-smartlog-remotenames.t
+++ b/tests/test-fb-hgext-smartlog-remotenames.t
@@ -1,7 +1,7 @@
   $ . $TESTDIR/require-ext.sh remotenames
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > smartlog=$TESTDIR/../hgext3rd/smartlog.py
+  > smartlog=
   > remotenames=
   > EOF
 
diff --git a/tests/test-fb-hgext-smartlog-tweakdefaults.t b/tests/test-fb-hgext-smartlog-tweakdefaults.t
index 8b36177dbb..44261650d8 100644
--- a/tests/test-fb-hgext-smartlog-tweakdefaults.t
+++ b/tests/test-fb-hgext-smartlog-tweakdefaults.t
@@ -1,9 +1,9 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > rebase=
-  > smartlog=$TESTDIR/../hgext3rd/smartlog.py
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > smartlog=
+  > tweakdefaults=
+  > fbamend=
   > [experimental]
   > evolution=createmarkers
   > evolution.allowdivergence=on
diff --git a/tests/test-fb-hgext-smartlog.t b/tests/test-fb-hgext-smartlog.t
index bda7b98cad..884d416684 100644
--- a/tests/test-fb-hgext-smartlog.t
+++ b/tests/test-fb-hgext-smartlog.t
@@ -2,7 +2,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > smartlog = $TESTDIR/../hgext3rd/smartlog.py
+  > smartlog=
   > [experimental]
   > graphstyle.grandparent=|
   > graphstyle.missing=|
diff --git a/tests/test-fb-hgext-sparse-clear.t b/tests/test-fb-hgext-sparse-clear.t
index 321a0ad688..64ebe09802 100644
--- a/tests/test-fb-hgext-sparse-clear.t
+++ b/tests/test-fb-hgext-sparse-clear.t
@@ -4,7 +4,7 @@ test sparse
   $ cd myrepo
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-fb-hgext-sparse-clone.t b/tests/test-fb-hgext-sparse-clone.t
index 76318abaed..cd013366d3 100644
--- a/tests/test-fb-hgext-sparse-clone.t
+++ b/tests/test-fb-hgext-sparse-clone.t
@@ -5,7 +5,7 @@ test sparse
   > ssh = python "$RUNTESTDIR/dummyssh"
   > username = nobody <no.reply@fb.com>
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-fb-hgext-sparse-diff.t b/tests/test-fb-hgext-sparse-diff.t
index f3794f8973..5260ce8454 100644
--- a/tests/test-fb-hgext-sparse-diff.t
+++ b/tests/test-fb-hgext-sparse-diff.t
@@ -2,7 +2,7 @@
   $ cd repo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
   $ mkdir show hide
   $ echo show-modify-1 > show/modify
diff --git a/tests/test-fb-hgext-sparse-extensions.t b/tests/test-fb-hgext-sparse-extensions.t
index 75c09cbf1a..8dd3716c8c 100644
--- a/tests/test-fb-hgext-sparse-extensions.t
+++ b/tests/test-fb-hgext-sparse-extensions.t
@@ -4,7 +4,7 @@ test sparse interaction with other extensions
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > strip=
   > [simplecache]
   > cachedir=$TESTTMP/hgsimplecache
@@ -12,7 +12,7 @@ test sparse interaction with other extensions
 
 Test integration with simplecache for profile reads
 
-  $ $PYTHON -c 'import hgext3rd.simplecache' || exit 80
+  $ $PYTHON -c 'import hgext.simplecache' || exit 80
   $ printf "[include]\nfoo\n" > .hgsparse
   $ hg add .hgsparse
   $ hg commit -qm 'Add profile'
diff --git a/tests/test-fb-hgext-sparse-import.t b/tests/test-fb-hgext-sparse-import.t
index 107e007d4a..0096e05428 100644
--- a/tests/test-fb-hgext-sparse-import.t
+++ b/tests/test-fb-hgext-sparse-import.t
@@ -4,7 +4,7 @@ test sparse
   $ cd myrepo
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > purge=
   > strip=
   > rebase=
diff --git a/tests/test-fb-hgext-sparse-merges.t b/tests/test-fb-hgext-sparse-merges.t
index 084a26394c..29ab426362 100644
--- a/tests/test-fb-hgext-sparse-merges.t
+++ b/tests/test-fb-hgext-sparse-merges.t
@@ -4,7 +4,7 @@ test merging things outside of the sparse checkout
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
 
   $ echo foo > foo
diff --git a/tests/test-fb-hgext-sparse-notsparse.t b/tests/test-fb-hgext-sparse-notsparse.t
index c4fadc4aef..aa184e0672 100644
--- a/tests/test-fb-hgext-sparse-notsparse.t
+++ b/tests/test-fb-hgext-sparse-notsparse.t
@@ -7,7 +7,7 @@ First create a base repository with sparse enabled.
   $ cd base
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > journal=
   > EOF
 
diff --git a/tests/test-fb-hgext-sparse-profiles.t b/tests/test-fb-hgext-sparse-profiles.t
index 4f112fa27a..69384e0f35 100644
--- a/tests/test-fb-hgext-sparse-profiles.t
+++ b/tests/test-fb-hgext-sparse-profiles.t
@@ -4,7 +4,7 @@ test sparse
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > purge=
   > strip=
   > rebase=
@@ -252,7 +252,7 @@ Test file permissions changing across a sparse profile change
   $ cd sparseperm
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
   $ touch a b
   $ cat > .hgsparse <<EOF
@@ -278,7 +278,7 @@ Test profile discovery
   $ cd sparseprofiles
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
   $ mkdir -p profiles/foo profiles/bar
   $ touch profiles/README.txt
diff --git a/tests/test-fb-hgext-sparse-rebase.t b/tests/test-fb-hgext-sparse-rebase.t
index 12e54c0983..c659a6966d 100644
--- a/tests/test-fb-hgext-sparse-rebase.t
+++ b/tests/test-fb-hgext-sparse-rebase.t
@@ -2,7 +2,7 @@
   $ cd repo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > dragdag=$RUNTESTDIR/drawdag.py
   > rebase=
   > EOF
diff --git a/tests/test-fb-hgext-sparse-verbose-json.t b/tests/test-fb-hgext-sparse-verbose-json.t
index b204d95872..80c7546e7a 100644
--- a/tests/test-fb-hgext-sparse-verbose-json.t
+++ b/tests/test-fb-hgext-sparse-verbose-json.t
@@ -4,7 +4,7 @@ test sparse with --verbose and -T json
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > strip=
   > EOF
 
diff --git a/tests/test-fb-hgext-sparse.t b/tests/test-fb-hgext-sparse.t
index 420099aa38..71b35da84d 100644
--- a/tests/test-fb-hgext-sparse.t
+++ b/tests/test-fb-hgext-sparse.t
@@ -4,7 +4,7 @@ test sparse
   $ cd myrepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > strip=
   > EOF
 
@@ -364,7 +364,7 @@ Test non-sparse repos work while sparse is loaded
   $ cd sparserepo
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > sparse=$TESTDIR/../hgext3rd/fbsparse.py
+  > sparse=$TESTDIR/../hgext/fbsparse.py
   > EOF
   $ cd ../nonsparserepo
   $ echo x > x && hg add x && hg commit -qAm x
diff --git a/tests/test-fb-hgext-sshaskpass.py b/tests/test-fb-hgext-sshaskpass.py
index 61dcf0fe8b..3435b51822 100644
--- a/tests/test-fb-hgext-sshaskpass.py
+++ b/tests/test-fb-hgext-sshaskpass.py
@@ -2,8 +2,7 @@ import os
 import sys
 
 # Make sure we use sshaskpass.py in this repo, unaffected by PYTHONPATH
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../hgext3rd'))
-import sshaskpass
+from hgext import sshaskpass
 
 # stdin, stderr have to be tty to run test
 pid, master = os.forkpty()
diff --git a/tests/test-fb-hgext-template-stat.t b/tests/test-fb-hgext-template-stat.t
index bdcd4a43f4..d2ccd0cba2 100644
--- a/tests/test-fb-hgext-template-stat.t
+++ b/tests/test-fb-hgext-template-stat.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > stat=$TESTDIR/../hgext3rd/stat.py
+  > stat=
   > EOF
 
 Setup repo
diff --git a/tests/test-fb-hgext-tweakdefaults-blame.t b/tests/test-fb-hgext-tweakdefaults-blame.t
index 4bcc276c3d..b08a705c28 100644
--- a/tests/test-fb-hgext-tweakdefaults-blame.t
+++ b/tests/test-fb-hgext-tweakdefaults-blame.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
 Test wrapped blame to be able to handle the usual command line attributes
diff --git a/tests/test-fb-hgext-tweakdefaults-bookmarks.t b/tests/test-fb-hgext-tweakdefaults-bookmarks.t
index 911c694601..e0bbf47757 100644
--- a/tests/test-fb-hgext-tweakdefaults-bookmarks.t
+++ b/tests/test-fb-hgext-tweakdefaults-bookmarks.t
@@ -4,8 +4,8 @@ Set up
   > [experimental]
   > evolution=all
   > [extensions]
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > fbamend=
+  > tweakdefaults=
   > EOF
 
 Test hg bookmark works with hidden commits
diff --git a/tests/test-fb-hgext-tweakdefaults-grep.t b/tests/test-fb-hgext-tweakdefaults-grep.t
index 9cd550d684..89cab0df8f 100644
--- a/tests/test-fb-hgext-tweakdefaults-grep.t
+++ b/tests/test-fb-hgext-tweakdefaults-grep.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > rebase=
   > EOF
 
diff --git a/tests/test-fb-hgext-tweakdefaults-histgrep.t b/tests/test-fb-hgext-tweakdefaults-histgrep.t
index bdd3df48c8..6681a8e04b 100644
--- a/tests/test-fb-hgext-tweakdefaults-histgrep.t
+++ b/tests/test-fb-hgext-tweakdefaults-histgrep.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > rebase=
   > EOF
 
diff --git a/tests/test-fb-hgext-tweakdefaults-opawarecommands.t b/tests/test-fb-hgext-tweakdefaults-opawarecommands.t
index 5d7810f990..2ed8aff146 100644
--- a/tests/test-fb-hgext-tweakdefaults-opawarecommands.t
+++ b/tests/test-fb-hgext-tweakdefaults-opawarecommands.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > tweakdefaults=
+  > fbamend=
   > rebase=
   > [experimental]
   > evolution=createmarkers
diff --git a/tests/test-fb-hgext-tweakdefaults-ordering.t b/tests/test-fb-hgext-tweakdefaults-ordering.t
index 552a179809..2bfe6ffd03 100644
--- a/tests/test-fb-hgext-tweakdefaults-ordering.t
+++ b/tests/test-fb-hgext-tweakdefaults-ordering.t
@@ -6,7 +6,7 @@ Set up extensions (order is important here, we must test tweakdefaults loading l
   > [extensions]
   > rebase=
   > remotenames=
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
 Run test
diff --git a/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd.t b/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd.t
index a183b0b961..ec012f5cd2 100644
--- a/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd.t
+++ b/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd.t
@@ -2,7 +2,7 @@ Set up without remotenames
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > rebase=
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames.t b/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames.t
index 9c983df7b8..4e4f1ef20d 100644
--- a/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames.t
+++ b/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames.t
@@ -5,7 +5,7 @@ Set up with remotenames
   > [extensions]
   > rebase=
   > remotenames=
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-tweakdefaults-remotenames.t b/tests/test-fb-hgext-tweakdefaults-remotenames.t
index 89e843a804..b9c597db15 100644
--- a/tests/test-fb-hgext-tweakdefaults-remotenames.t
+++ b/tests/test-fb-hgext-tweakdefaults-remotenames.t
@@ -6,7 +6,7 @@ Set up
   > [extensions]
   > rebase=
   > remotenames=
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
   $ hg init repo
diff --git a/tests/test-fb-hgext-tweakdefaults-revsets.t b/tests/test-fb-hgext-tweakdefaults-revsets.t
index a4cfee97f8..05ecb65427 100644
--- a/tests/test-fb-hgext-tweakdefaults-revsets.t
+++ b/tests/test-fb-hgext-tweakdefaults-revsets.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
 Setup repo
diff --git a/tests/test-fb-hgext-tweakdefaults-update.t b/tests/test-fb-hgext-tweakdefaults-update.t
index 998523da64..3bb974b1e4 100644
--- a/tests/test-fb-hgext-tweakdefaults-update.t
+++ b/tests/test-fb-hgext-tweakdefaults-update.t
@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > rebase=
   > [experimental]
   > updatecheck=noconflict
diff --git a/tests/test-fb-hgext-tweakdefaults.t b/tests/test-fb-hgext-tweakdefaults.t
index 64b41f8a78..35290442d3 100644
--- a/tests/test-fb-hgext-tweakdefaults.t
+++ b/tests/test-fb-hgext-tweakdefaults.t
@@ -2,8 +2,8 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > tweakdefaults=
+  > fbamend=
   > rebase=
   > histedit=
   > [experimental]
@@ -431,7 +431,6 @@ Test histedit date when tweakdefaults.histeditkeepdate is set
   > pick 18
   > pick 17
   > EOF
-  [1]
   $ hg log -l 3 -T "{date} {rev} {desc}\n"
   0.00 18 commit 2 for histedit
   0.00 17 commit 3 for histedit
@@ -443,7 +442,6 @@ Test histedit date when tweakdefaults.histeditkeepdate is not set
   > pick 18
   > pick 17
   > EOF
-  [1]
   $ hg log -l 2 -T "{rev} {desc}\n" -d "yesterday to today"
   18 commit 3 for histedit
   17 commit 2 for histedit
@@ -528,7 +526,7 @@ and allowance of prune rebases
   > evolution.allowdivergence=off
   > [extensions]
   > strip=
-  > fbamend=$TESTDIR/../hgext3rd/fbamend
+  > fbamend=
   > EOF
   $ echo root > root && hg ci -Am root  # rev 0
   adding root
@@ -557,7 +555,7 @@ Test that we show divergence warning if inhibit is disabled
 
 Test that we do not show divergence warning if inhibit is enabled
   $ cat >> .hg/hgrc <<EOF
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > inhibit=
   > EOF
   $ hg rebase -r 1 -d 3 --hidden
   rebasing 1:09d39afb522a "a"
diff --git a/tests/test-fb-hgext-undo.t b/tests/test-fb-hgext-undo.t
index 52261a3dfc..9adf2e181a 100644
--- a/tests/test-fb-hgext-undo.t
+++ b/tests/test-fb-hgext-undo.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > undo = $TESTDIR/../hgext3rd/undo.py
-  > inhibit=$TESTDIR/../hgext3rd/inhibit.py
+  > undo=
+  > inhibit=
   > [undo]
   > _duringundologlock=1
   > [experimental]
@@ -125,7 +125,7 @@ Test gap in data (extension dis and enabled)
   $ touch cmiss && hg add cmiss && hg ci -mcmiss
   $ cat >>$HGRCPATH <<EOF
   > [extensions]
-  > undo = $TESTDIR/../hgext3rd/undo.py
+  > undo=
   > EOF
   $ touch a5 && hg add a5 && hg ci -ma5
   $ hg debugundohistory -l
@@ -379,9 +379,9 @@ divergence cases in undo.  The original split/divergence obsmarkers suffice for
 checking split/divergence.
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > smartlog = $TESTDIR/../hgext3rd/smartlog.py
-  > tweakdefaults = $TESTDIR/../hgext3rd/tweakdefaults.py
-  > fbamend = $TESTDIR/../hgext3rd/fbamend/
+  > smartlog=
+  > tweakdefaults=
+  > fbamend=
   > EOF
   $ hg undo
   undone to *, before commit --amend (glob)
@@ -701,7 +701,7 @@ Check local undo with facebook style strip
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > strip =
-  > fbamend = $TESTDIR/../hgext3rd/fbamend/
+  > fbamend=
   > EOF
   $ hg strip 3ee6
   advice: 'hg hide' provides a better UI for hiding commits
@@ -1258,7 +1258,7 @@ permanently delete a commit, we do not want to undo to this state.
 Obsmarkers for instack amend
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > fbamend = $TESTDIR/../hgext3rd/fbamend/
+  > fbamend=
   > EOF
   $ hg update 0963
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-fb-hgext-update-i.t b/tests/test-fb-hgext-update-i.t
index 61fac406de..fe5c35365b 100644
--- a/tests/test-fb-hgext-update-i.t
+++ b/tests/test-fb-hgext-update-i.t
@@ -6,7 +6,7 @@ should not print the related ui.status outputs
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > tweakdefaults = $TESTDIR/../hgext3rd/tweakdefaults.py
+  > tweakdefaults=
   > EOF
 
 Set up the repository.
diff --git a/tests/test-fb-hgext-whereami.t b/tests/test-fb-hgext-whereami.t
index 24e3a00ae5..96c74e98a2 100644
--- a/tests/test-fb-hgext-whereami.t
+++ b/tests/test-fb-hgext-whereami.t
@@ -4,7 +4,7 @@ Test whereami
   $ cd repo1
   $ cat > .hg/hgrc <<EOF
   > [extensions]
-  > whereami=$TESTDIR/../hgext3rd/whereami.py
+  > whereami=
   > EOF
 
   $ hg whereami