diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3532,7 +3532,7 @@
     'DifferentialActionEmailCommand' => 'MetaMTAEmailTransactionCommand',
     'DifferentialActionMenuEventListener' => 'PhabricatorEventListener',
     'DifferentialAddCommentView' => 'AphrontView',
-    'DifferentialAdjustmentMapTestCase' => 'ArcanistPhutilTestCase',
+    'DifferentialAdjustmentMapTestCase' => 'PhutilTestCase',
     'DifferentialAffectedPath' => 'DifferentialDAO',
     'DifferentialApplyPatchField' => 'DifferentialCustomField',
     'DifferentialAsanaRepresentationField' => 'DifferentialCustomField',
@@ -3597,7 +3597,7 @@
     'DifferentialDiffProperty' => 'DifferentialDAO',
     'DifferentialDiffQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'DifferentialDiffTableOfContentsView' => 'AphrontView',
-    'DifferentialDiffTestCase' => 'ArcanistPhutilTestCase',
+    'DifferentialDiffTestCase' => 'PhutilTestCase',
     'DifferentialDiffTransaction' => 'PhabricatorApplicationTransaction',
     'DifferentialDiffViewController' => 'DifferentialController',
     'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
@@ -3626,7 +3626,7 @@
     ),
     'DifferentialHunkParserTestCase' => 'PhabricatorTestCase',
     'DifferentialHunkQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'DifferentialHunkTestCase' => 'ArcanistPhutilTestCase',
+    'DifferentialHunkTestCase' => 'PhutilTestCase',
     'DifferentialInlineComment' => 'PhabricatorInlineCommentInterface',
     'DifferentialInlineCommentEditController' => 'PhabricatorInlineCommentController',
     'DifferentialInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
@@ -3861,7 +3861,7 @@
     'DiffusionTagListController' => 'DiffusionController',
     'DiffusionTagListView' => 'DiffusionView',
     'DiffusionTagsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
-    'DiffusionURITestCase' => 'ArcanistPhutilTestCase',
+    'DiffusionURITestCase' => 'PhutilTestCase',
     'DiffusionUpdateCoverageConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionView' => 'AphrontView',
     'DivinerArticleAtomizer' => 'DivinerAtomizer',
@@ -6083,7 +6083,7 @@
     'PhabricatorTOTPAuthFactorTestCase' => 'PhabricatorTestCase',
     'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
     'PhabricatorTestApplication' => 'PhabricatorApplication',
-    'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
+    'PhabricatorTestCase' => 'PhutilTestCase',
     'PhabricatorTestController' => 'PhabricatorController',
     'PhabricatorTestNoCycleEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorTestStorageEngine' => 'PhabricatorFileStorageEngine',
diff --git a/src/applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php b/src/applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php
--- a/src/applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialAdjustmentMapTestCase extends ArcanistPhutilTestCase {
+final class DifferentialAdjustmentMapTestCase extends PhutilTestCase {
 
   public function testBasicMaps() {
     $change_map = array(
diff --git a/src/applications/differential/storage/__tests__/DifferentialDiffTestCase.php b/src/applications/differential/storage/__tests__/DifferentialDiffTestCase.php
--- a/src/applications/differential/storage/__tests__/DifferentialDiffTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialDiffTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialDiffTestCase extends ArcanistPhutilTestCase {
+final class DifferentialDiffTestCase extends PhutilTestCase {
 
   public function testDetectCopiedCode() {
     $copies = $this->detectCopiesIn('lint_engine.diff');
diff --git a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
--- a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialHunkTestCase extends ArcanistPhutilTestCase {
+final class DifferentialHunkTestCase extends PhutilTestCase {
 
   public function testMakeChanges() {
     $root = dirname(__FILE__).'/hunk/';
diff --git a/src/applications/diffusion/request/__tests__/DiffusionURITestCase.php b/src/applications/diffusion/request/__tests__/DiffusionURITestCase.php
--- a/src/applications/diffusion/request/__tests__/DiffusionURITestCase.php
+++ b/src/applications/diffusion/request/__tests__/DiffusionURITestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DiffusionURITestCase extends ArcanistPhutilTestCase {
+final class DiffusionURITestCase extends PhutilTestCase {
 
   public function testBlobDecode() {
     $map = array(
diff --git a/src/docs/contributor/unit_tests.diviner b/src/docs/contributor/unit_tests.diviner
--- a/src/docs/contributor/unit_tests.diviner
+++ b/src/docs/contributor/unit_tests.diviner
@@ -21,7 +21,7 @@
   - Create a ##__tests__/## directory in the module if it doesn't exist yet.
   - Add classes to the ##__tests__/## directory which extend from
     @{class:PhabricatorTestCase} (in Phabricator) or
-    @{class@arcanist:ArcanistPhutilTestCase} (elsewhere).
+    @{class@arcanist:PhutilTestCase} (elsewhere).
   - Run ##arc liberate## on the library root so your classes are loadable.
 
 = Running Tests =
@@ -60,7 +60,7 @@
    PASS   <1ms*  testAllIsRightWithTheWorld
 
 For more information on writing tests, see
-@{class@arcanist:ArcanistPhutilTestCase} and @{class:PhabricatorTestCase}.
+@{class@arcanist:PhutilTestCase} and @{class:PhabricatorTestCase}.
 
 = Database Isolation =
 
diff --git a/src/docs/user/userguide/arcanist_coverage.diviner b/src/docs/user/userguide/arcanist_coverage.diviner
--- a/src/docs/user/userguide/arcanist_coverage.diviner
+++ b/src/docs/user/userguide/arcanist_coverage.diviner
@@ -64,6 +64,6 @@
   );
 
 You may also want to filter coverage information to the paths passed to the
-unit test engine. See @{class@arcanist:ArcanistPhutilTestCase} and
+unit test engine. See @{class@arcanist:PhutilTestCase} and
 @{class@arcanist:PhutilUnitTestEngine} for an example of coverage integration
 in PHP using Xdebug.
diff --git a/src/infrastructure/testing/PhabricatorTestCase.php b/src/infrastructure/testing/PhabricatorTestCase.php
--- a/src/infrastructure/testing/PhabricatorTestCase.php
+++ b/src/infrastructure/testing/PhabricatorTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class PhabricatorTestCase extends ArcanistPhutilTestCase {
+abstract class PhabricatorTestCase extends PhutilTestCase {
 
   const NAMESPACE_PREFIX = 'phabricator_unittest_';
 
@@ -166,14 +166,6 @@
     return new PhabricatorStorageFixtureScopeGuard($name);
   }
 
-  protected function getLink($method) {
-    $phabricator_project = 'PHID-APRJ-3f1fc779edeab89b2171';
-    return
-      'https://secure.phabricator.com/diffusion/symbol/'.$method.
-      '/?lang=php&projects='.$phabricator_project.
-      '&jump=true&context='.get_class($this);
-  }
-
   /**
    * Returns an integer seed to use when building unique identifiers (e.g.,
    * non-colliding usernames). The seed is unstable and its value will change