diff --git a/src/applications/config/check/PhabricatorSetupCheckDatabase.php b/src/applications/config/check/PhabricatorSetupCheckDatabase.php
index 67ce6bc94..adef6a7cc 100644
--- a/src/applications/config/check/PhabricatorSetupCheckDatabase.php
+++ b/src/applications/config/check/PhabricatorSetupCheckDatabase.php
@@ -1,99 +1,85 @@
 <?php
 
 final class PhabricatorSetupCheckDatabase extends PhabricatorSetupCheck {
 
   public function getExecutionOrder() {
     // This must run after basic PHP checks, but before most other checks.
     return 0.5;
   }
 
   protected function executeChecks() {
     $conf = PhabricatorEnv::newObjectFromConfig('mysql.configuration-provider');
     $conn_user = $conf->getUser();
     $conn_pass = $conf->getPassword();
     $conn_host = $conf->getHost();
 
     ini_set('mysql.connect_timeout', 2);
 
     $conn_raw = PhabricatorEnv::newObjectFromConfig(
       'mysql.implementation',
       array(
         array(
           'user'      => $conn_user,
           'pass'      => $conn_pass,
           'host'      => $conn_host,
           'database'  => null,
         ),
       ));
 
     try {
       queryfx($conn_raw, 'SELECT 1');
     } catch (AphrontQueryConnectionException $ex) {
       $message = pht(
         "Unable to connect to MySQL!\n\n".
         "%s\n\n".
         "Make sure Phabricator and MySQL are correctly configured.",
         $ex->getMessage());
 
       $this->newIssue('mysql.connect')
         ->setName(pht('Can Not Connect to MySQL'))
         ->setMessage($message)
         ->setIsFatal(true)
         ->addPhabricatorConfig('mysql.host')
         ->addPhabricatorConfig('mysql.user')
         ->addPhabricatorConfig('mysql.pass');
       return;
     }
 
     $engines = queryfx_all($conn_raw, 'SHOW ENGINES');
     $engines = ipull($engines, 'Support', 'Engine');
 
     $innodb = idx($engines, 'InnoDB');
     if ($innodb != 'YES' && $innodb != 'DEFAULT') {
       $message = pht(
         "The 'InnoDB' engine is not available in MySQL. Enable InnoDB in ".
         "your MySQL configuration.".
         "\n\n".
         "(If you aleady created tables, MySQL incorrectly used some other ".
         "engine to create them. You need to convert them or drop and ".
         "reinitialize them.)");
 
       $this->newIssue('mysql.innodb')
         ->setName(pht('MySQL InnoDB Engine Not Available'))
         ->setMessage($message)
         ->setIsFatal(true);
       return;
     }
 
-    if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
-      $mode_string = queryfx_one($conn_raw, "SELECT @@sql_mode");
-      $modes = explode(',', $mode_string['@@sql_mode']);
-      if (!in_array('STRICT_ALL_TABLES', $modes)) {
-        $message = pht(
-          "The global sql_mode is not set to 'STRICT_ALL_TABLES'. It is ".
-          "recommended that you set this mode while developing Phabricator.");
-
-        $this->newIssue('mysql.mode')
-          ->setName(pht('MySQL STRICT_ALL_TABLES mode not set.'))
-          ->setMessage($message);
-      }
-    }
-
     $namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace');
 
     $databases = queryfx_all($conn_raw, 'SHOW DATABASES');
     $databases = ipull($databases, 'Database', 'Database');
 
     if (empty($databases[$namespace.'_meta_data'])) {
       $message = pht(
         'Run the storage upgrade script to setup Phabricator\'s database '.
         'schema.');
 
       $this->newIssue('storage.upgrade')
         ->setName(pht('Setup MySQL Schema'))
         ->setMessage($message)
         ->setIsFatal(true)
         ->addCommand('<tt>phabricator/ $</tt> ./bin/storage upgrade');
     }
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckMySQL.php b/src/applications/config/check/PhabricatorSetupCheckMySQL.php
index e8de03bb5..cabb822e8 100644
--- a/src/applications/config/check/PhabricatorSetupCheckMySQL.php
+++ b/src/applications/config/check/PhabricatorSetupCheckMySQL.php
@@ -1,29 +1,54 @@
 <?php
 
 final class PhabricatorSetupCheckMySQL extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $conn_raw = id(new PhabricatorUser())->establishConnection('w');
 
     $max_allowed_packet = queryfx_one(
       $conn_raw,
       'SHOW VARIABLES LIKE %s',
       'max_allowed_packet');
     $max_allowed_packet = idx($max_allowed_packet, 'Value', PHP_INT_MAX);
 
     $recommended_minimum = 1024 * 1024;
     if ($max_allowed_packet < $recommended_minimum) {
       $message = pht(
         "MySQL is configured with a very small 'max_allowed_packet' (%d), ".
         "which may cause some large writes to fail. Strongly consider raising ".
         "this to at least %d in your MySQL configuration.",
         $max_allowed_packet,
         $recommended_minimum);
 
       $this->newIssue('mysql.max_allowed_packet')
         ->setName(pht('Small MySQL "max_allowed_packet"'))
         ->setMessage($message);
     }
+
+    if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
+      $mode_string = queryfx_one($conn_raw, "SELECT @@sql_mode");
+      $modes = explode(',', $mode_string['@@sql_mode']);
+      if (!in_array('STRICT_ALL_TABLES', $modes)) {
+        $summary = pht(
+          "MySQL is not in strict mode, but should be for Phabricator ".
+          "development.");
+
+        $message = pht(
+          "This install is in developer mode, but the global sql_mode is not ".
+          "set to 'STRICT_ALL_TABLES'. It is recommended that you set this ".
+          "mode while developing Phabricator. Strict mode will promote some ".
+          "query warnings to errors, and ensure you don't miss them during ".
+          "development. You can find more information about this mode (and ".
+          "how to configure it) in the MySQL manual.");
+
+        $this->newIssue('mysql.mode')
+          ->setName(pht('MySQL STRICT_ALL_TABLES Mode Not Set'))
+          ->addPhabricatorConfig('phabricator.developer-mode')
+          ->setSummary($summary)
+          ->setMessage($message);
+      }
+    }
+
   }
 
 }