diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 26ec0f9035..4b2ba6bef9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -5412,6 +5412,7 @@ phutil_register_library_map(array(
     'PhorgeCodeWarningSetupCheck' => 'applications/config/check/PhorgeCodeWarningSetupCheck.php',
     'PhorgeFlagFlaggedObjectCustomField' => 'applications/flag/customfield/PhorgeFlagFlaggedObjectCustomField.php',
     'PhorgeFlagFlaggedObjectFieldStorage' => 'applications/flag/customfield/PhorgeFlagFlaggedObjectFieldStorage.php',
+    'PhorgeI18nTestCase' => '__tests__/PhorgeI18nTestCase.php',
     'PhorgeInternationalizationManagementValidateWorkflow' => 'infrastructure/internationalization/management/PhorgeInternationalizationManagementValidateWorkflow.php',
     'PhorgeInternationalizationValidator' => 'infrastructure/internationalization/management/PhorgeInternationalizationValidator.php',
     'PhorgePHPASTParseTree' => 'applications/phpast/storage/PhorgePHPASTParseTree.php',
@@ -12286,6 +12287,7 @@ phutil_register_library_map(array(
     'PhorgeCodeWarningSetupCheck' => 'PhabricatorSetupCheck',
     'PhorgeFlagFlaggedObjectCustomField' => 'PhabricatorCustomField',
     'PhorgeFlagFlaggedObjectFieldStorage' => 'Phobject',
+    'PhorgeI18nTestCase' => 'PhabricatorTestCase',
     'PhorgeInternationalizationManagementValidateWorkflow' => 'PhabricatorInternationalizationManagementWorkflow',
     'PhorgeInternationalizationValidator' => 'Phobject',
     'PhorgePHPASTParseTree' => 'PhabricatorXHPASTDAO',
diff --git a/src/__tests__/PhorgeI18nTestCase.php b/src/__tests__/PhorgeI18nTestCase.php
new file mode 100644
index 0000000000..7cb521b333
--- /dev/null
+++ b/src/__tests__/PhorgeI18nTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+final class PhorgeI18nTestCase extends PhabricatorTestCase {
+    public function testi18nValidation() {
+      $validator = new PhorgeInternationalizationValidator();
+      $errors = $validator->validateLibraries(
+        $validator->loadExtractions(true, true));
+      $this->assertEqual(array(),
+        $errors,
+        pht('i18n validation errors found!'));
+    }
+}
diff --git a/src/infrastructure/internationalization/management/PhorgeInternationalizationValidator.php b/src/infrastructure/internationalization/management/PhorgeInternationalizationValidator.php
index 056a2a1a74..0c64d077c3 100644
--- a/src/infrastructure/internationalization/management/PhorgeInternationalizationValidator.php
+++ b/src/infrastructure/internationalization/management/PhorgeInternationalizationValidator.php
@@ -14,7 +14,7 @@ final class PhorgeInternationalizationValidator extends Phobject {
             new PhutilNumber($n + 1),
             phutil_count($types));
         }
-        $data = [];
+        $data = array();
         foreach ($types as $type) {
           if ($type === 'phutilnumber') {
             // Make a class that can be converted into a string
@@ -93,10 +93,10 @@ final class PhorgeInternationalizationValidator extends Phobject {
     return $errors;
   }
   public function validateLibraries($loaded_json) {
-    $errors = [];
+    $errors = array();
     $all_translations = PhutilTranslation::getAllTranslations();
     $locales = PhutilLocale::loadAllLocales();
-    $keyed_translations = [];
+    $keyed_translations = array();
     $override_key = 'translation.override';
     try {
       $trans_override = PhabricatorEnv::getEnvConfig($override_key);
@@ -164,23 +164,32 @@ final class PhorgeInternationalizationValidator extends Phobject {
     }
     return $errors;
   }
-  public function loadExtractions($run_extractor) {
+  public function loadExtractions($run_extractor, $quiet = false) {
     $libraries = PhutilBootloader::getInstance()->getAllLibraries();
     $phorge_root = phutil_get_library_root('phorge');
-    $i18n_bin = $phorge_root.'/../bin/i18n';
-    $all_json = [];
+    $i18n_bin = Filesystem::resolvePath('../bin/i18n', $phorge_root);
+    $all_json = array();
     foreach ($libraries as $lib) {
       $root = phutil_get_library_root($lib);
-      $json = Filesystem::resolvePath($root.'/.cache/i18n_strings.json');
+      $json = Filesystem::resolvePath('.cache/i18n_strings.json', $root);
       if ($run_extractor) {
-        $err = phutil_passthru(
-          '%R extract %s',
-          $i18n_bin,
-          $root);
-        if ($err) {
-          throw new Exception(pht(
-            'Failed to run i18n extractor: %s',
-            $err));
+        // The command needs to be stated twice to avoid the linter complaining
+        // about the arg not being a scalar string
+        if ($quiet) {
+          execx(
+            '%R extract %s',
+            $i18n_bin,
+            $root);
+        } else {
+          $err = phutil_passthru(
+            '%R extract %s',
+            $i18n_bin,
+            $root);
+          if ($err) {
+            throw new Exception(pht(
+              'Failed to run i18n extractor: %s',
+              $err));
+          }
         }
       } else if (!Filesystem::pathExists($json)) {
         throw new Exception(pht(