diff --git a/apdqc.install b/apdqc.install
index cf95157..7e310f5 100644
--- a/apdqc.install
+++ b/apdqc.install
@@ -127,107 +127,108 @@ function apdqc_requirements($phase) {
   // Ensure translations don't break at install time.
   $t = get_t();
 
-  if ($phase === 'runtime') {
-    // Only working with MySQL currently.
-    $db_type = apdqc_fast_get_db_type();
-    if ($db_type !== 'mysql') {
-      $requirements['apdqc_mysql'] = array(
+  // Only working with MySQL currently.
+  $db_type = apdqc_fast_get_db_type();
+  if ($db_type !== 'mysql') {
+    $requirements['apdqc_mysql'] = array(
+      'title' => $t('APDQC'),
+      'value' => $phase === 'install' ? FALSE : $t('This module requires MySQL.'),
+      'description' => $t('Currently APDQC only works with MySQL.'),
+      'severity' => REQUIREMENT_ERROR,
+    );
+  }
+
+  // Only working with php 5.3+.
+  if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50300) {
+    $requirements['apdqc_php'] = array(
+      'title' => $t('APDQC'),
+      'value' => $phase === 'install' ? FALSE : $t('This module requires PHP 5.3 or higher.'),
+      'description' => $t('Currently APDQC only works with PHP 5.3 or newer.'),
+      'severity' => REQUIREMENT_ERROR,
+    );
+  }
+
+  // This module requires MySQL 5.5 or higher.
+  if (!variable_get('apdqc_install_ignore_mysql_version', APDQC_INSTALL_IGNORE_MYSQL_VERSION)) {
+    $results = db_query("SELECT VERSION()")->fetchAssoc();
+    $version = reset($results);
+    if (version_compare($version, '5.5.0', '<=')) {
+      $requirements['apdqc_mysql_version'] = array(
         'title' => $t('APDQC'),
-        'value' => $phase === 'install' ? FALSE : $t('This module requires MySQL.'),
-        'description' => $t('Currently APDQC only works with MySQL.'),
+        'value' => $phase === 'install' ? FALSE : $t('This module requires MySQL 5.5 or higher.'),
+        'description' => $t('Note that some older versions of MySQL will work with this module. If that is the case you can set this variable in your settings.php file to make this warning go away. <p><code>@code</code></p>', array(
+          '@code' => '$conf[\'apdqc_install_ignore_mysql_version\'] = TRUE;',
+        )),
         'severity' => REQUIREMENT_ERROR,
       );
     }
-    // Only working with php 5.3+.
-    if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50300) {
-      $requirements['apdqc_php'] = array(
-        'title' => $t('APDQC'),
-        'value' => $phase === 'install' ? FALSE : $t('This module requires PHP 5.3 or higher.'),
-        'description' => $t('Currently APDQC only works with PHP 5.3 or newer.'),
-        'severity' => REQUIREMENT_ERROR,
-      );
+  }
+
+  // Check if mysqlnd is installed.
+  $mysqlnd = get_loaded_extensions();
+  // If mysqlnd is not installed, throw an error.
+  if (empty($mysqlnd) || !in_array('mysqlnd', $mysqlnd)) {
+    $directions = $t('You need to <a href="@url">install the mysqlnd driver</a> on this system.', array('@url' => 'http://php.net/manual/en/mysqlnd.install.php'));
+    if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+      $release_info = array();
+      // Get server version.
+      exec('ls /etc/*release', $release_info);
+      $release_info_string = implode(',', $release_info);
+      $directions .= ' ';
+      if (strpos($release_info_string, 'lsb-release') !== FALSE) {
+        // PHP 5.4 on ubuntu has php5enmod available.
+        if (PHP_VERSION_ID < 50400) {
+          $directions .= $t('Run <code>sudo apt-get install php5-mysqlnd && sudo php5enmod mysqlnd<code>');
+        }
+        else {
+          $directions .= $t('Run <code>sudo apt-get install php5-mysqlnd</code>. You might need to add the extension to your php.ini file as well <code>extension=mysqlnd.so</code>; should be located here: @ini', array('@ini' => php_ini_loaded_file()));
+        }
+      }
+      elseif (strpos($release_info_string, 'redhat-release') !== FALSE) {
+        $directions .= $t('Run <code>sudo yum remove php-mysql && sudo yum install php-mysqlnd</code>. You might need to add the extension to your php.ini file as well <code>extension=mysqlnd.so</code>; should be located here: @ini', array('@ini' => php_ini_loaded_file()));
+      }
     }
+    $requirements['apdqc_mysqlnd'] = array(
+      'title' => $t('APDQC'),
+      'value' => $phase === 'install' ? FALSE : $t('The mysqlnd extension is not installed on this server.'),
+      'severity' => REQUIREMENT_ERROR,
+      'description' => $directions,
+    );
+  }
 
-    if (!variable_get('apdqc_install_ignore_mysql_version', APDQC_INSTALL_IGNORE_MYSQL_VERSION)) {
-      // This module requires MySQL 5.5 or higher.
-      $results = db_query("SELECT VERSION()")->fetchAssoc();
-      $version = reset($results);
-      if (version_compare($version, '5.5.0', '<=')) {
-        $requirements['apdqc_mysql_version'] = array(
+  // Check if mysqli async is available.
+  if (empty($requirements)) {
+    $function_list = array(
+      'mysqli_init',
+      'mysqli_reap_async_query',
+    );
+    // Check each function to make sure it exists.
+    foreach ($function_list as $function_name) {
+      if (!function_exists($function_name)) {
+        $requirements['apdqc_function_' . $function_name] = array(
           'title' => $t('APDQC'),
-          'value' => $phase === 'install' ? FALSE : $t('This module requires MySQL 5.5 or higher.'),
-          'description' => $t('Note that some older versions of MySQL will work with this module. If that is the case you can set this variable in your settings.php file to make this warning go away. <p><code>@code</code></p>', array(
-            '@code' => '$conf[\'apdqc_install_ignore_mysql_version\'] = TRUE;',
-          )),
+          'value' => $phase === 'install' ? FALSE : $function_name,
           'severity' => REQUIREMENT_ERROR,
+          'description' => $t('<a href="!url">%name()</a> is disabled on this server. Please contact your hosting provider and see if they can re-enable this function for you.', array(
+            '!url' => 'http://php.net/' . str_replace('_', '-', $function_name),
+            '%name' => $function_name,
+          )),
         );
       }
     }
 
-    // Check if mysqlnd is installed.
-    $mysqlnd = get_loaded_extensions();
-    // If mysqlnd is not installed, throw an error.
-    if (empty($mysqlnd) || !in_array('mysqlnd', $mysqlnd)) {
-      $directions = $t('You need to <a href="@url">install the mysqlnd driver</a> on this system.', array('@url' => 'http://php.net/manual/en/mysqlnd.install.php'));
-      if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-        $release_info = array();
-        // Get server version.
-        exec('ls /etc/*release', $release_info);
-        $release_info_string = implode(',', $release_info);
-        $directions .= ' ';
-        if (strpos($release_info_string, 'lsb-release') !== FALSE) {
-          // PHP 5.4 on ubuntu has php5enmod available.
-          if (PHP_VERSION_ID < 50400) {
-            $directions .= $t('Run <code>sudo apt-get install php5-mysqlnd && sudo php5enmod mysqlnd<code>');
-          }
-          else {
-            $directions .= $t('Run <code>sudo apt-get install php5-mysqlnd</code>. You might need to add the extension to your php.ini file as well <code>extension=mysqlnd.so</code>; should be located here: @ini', array('@ini' => php_ini_loaded_file()));
-          }
-        }
-        elseif (strpos($release_info_string, 'redhat-release') !== FALSE) {
-          $directions .= $t('Run <code>sudo yum remove php-mysql && sudo yum install php-mysqlnd</code>. You might need to add the extension to your php.ini file as well <code>extension=mysqlnd.so</code>; should be located here: @ini', array('@ini' => php_ini_loaded_file()));
-        }
-      }
-      $requirements['apdqc_mysqlnd'] = array(
+    // Check if mysqli async is available.
+    if (!defined('MYSQLI_ASYNC')) {
+      $requirements['apdqc_mysqli_async'] = array(
         'title' => $t('APDQC'),
-        'value' => $phase === 'install' ? FALSE : $t('The mysqlnd extension is not installed on this server.'),
+        'value' => $phase === 'install' ? FALSE : 'MYSQLI_ASYNC',
         'severity' => REQUIREMENT_ERROR,
-        'description' => $directions,
+        'description' => $t('MYSQLI_ASYNC is not available on this server. Please contact your hosting provider and see if they can make it available for you.'),
       );
     }
+  }
 
-    // Check if mysqli async is available.
-    if (empty($requirements)) {
-      $function_list = array(
-        'mysqli_init',
-        'mysqli_reap_async_query',
-      );
-      // Check each function to make sure it exists.
-      foreach ($function_list as $function_name) {
-        if (!function_exists($function_name)) {
-          $requirements['apdqc_function_' . $function_name] = array(
-            'title' => $t('APDQC'),
-            'value' => $phase === 'install' ? FALSE : $function_name,
-            'severity' => REQUIREMENT_ERROR,
-            'description' => $t('<a href="!url">%name()</a> is disabled on this server. Please contact your hosting provider and see if they can re-enable this function for you.', array(
-              '!url' => 'http://php.net/' . str_replace('_', '-', $function_name),
-              '%name' => $function_name,
-            )),
-          );
-        }
-      }
-
-      // Check if mysqli async is available.
-      if (!defined('MYSQLI_ASYNC')) {
-        $requirements['apdqc_mysqli_async'] = array(
-          'title' => $t('APDQC'),
-          'value' => $phase === 'install' ? FALSE : 'MYSQLI_ASYNC',
-          'severity' => REQUIREMENT_ERROR,
-          'description' => $t('MYSQLI_ASYNC is not available on this server. Please contact your hosting provider and see if they can make it available for you.'),
-        );
-      }
-    }
-
+  if ($phase === 'runtime') {
     // Warn if drupal_hash_salt is empty.
     // Error if empty and using a private file system.
     if (empty($GLOBALS['drupal_hash_salt'])) {
@@ -822,38 +823,38 @@ function apdqc_requirements($phase) {
         )),
       );
     }
-  }
 
-  // Test the connection.
-  if (empty($requirements)) {
-    if (class_exists('APDQCache')) {
-      if (!function_exists('apdqc_query')) {
-        // Load the correct database backend.
-        $db_type = apdqc_fast_get_db_type();
-        // Async queries are only available in PHP 5.3+.
-        if ($db_type === 'mysql' && defined('PHP_VERSION_ID') && PHP_VERSION_ID >= 50300) {
-          require_once 'apdqc.mysql.inc';
+    // Test the connection.
+    if (empty($requirements)) {
+      if (class_exists('APDQCache')) {
+        if (!function_exists('apdqc_query')) {
+          // Load the correct database backend.
+          $db_type = apdqc_fast_get_db_type();
+          // Async queries are only available in PHP 5.3+.
+          if ($db_type === 'mysql' && defined('PHP_VERSION_ID') && PHP_VERSION_ID >= 50300) {
+            require_once 'apdqc.mysql.inc';
+          }
+        }
+        // Check if the system module is in the system table. See if apdqc_query
+        // is working.
+        $result = apdqc_query(array('system'), array(), "SELECT * FROM " . apdqc_fast_prefix_tables('{' . apdqc_fast_escape_table('system') . '}') . " WHERE name = 'system' LIMIT 1", array('log' => FALSE));
+        if (!($result instanceof mysqli_result)) {
+          $requirements['apdqc_query_broken'] = array(
+            'title'       => $t('APDQC - Query Failure'),
+            'severity'    => REQUIREMENT_ERROR,
+            'value'       => $t('apdqc_query() is not returning valid data. Check your settings.php file and make sure the database portion is correct.'),
+          );
         }
       }
-      // Check if the system module is in the system table. See if apdqc_query
-      // is working.
-      $result = apdqc_query(array('system'), array(), "SELECT * FROM " . apdqc_fast_prefix_tables('{' . apdqc_fast_escape_table('system') . '}') . " WHERE name = 'system' LIMIT 1", array('log' => FALSE));
-      if (!($result instanceof mysqli_result)) {
-        $requirements['apdqc_query_broken'] = array(
-          'title'       => $t('APDQC - Query Failure'),
+      else {
+        // This should never show up, as it's covered above.
+        $requirements['apdqc_query_no_APDQCache_class'] = array(
+          'title'       => $t('APDQC - APDQCache Class not available'),
           'severity'    => REQUIREMENT_ERROR,
-          'value'       => $t('apdqc_query() is not returning valid data. Check your settings.php file and make sure the database portion is correct.'),
+          'value'       => $t('Make sure the cache_backends array contains apdqc.cache.inc.'),
         );
       }
     }
-    else {
-      // This should never show up, as it's covered above.
-      $requirements['apdqc_query_no_APDQCache_class'] = array(
-        'title'       => $t('APDQC - APDQCache Class not available'),
-        'severity'    => REQUIREMENT_ERROR,
-        'value'       => $t('Make sure the cache_backends array contains apdqc.cache.inc.'),
-      );
-    }
   }
 
   // Report back that everything is ok.
