diff --git a/features/db-import.feature b/features/db-import.feature
index af32c1be..23a7d414 100644
--- a/features/db-import.feature
+++ b/features/db-import.feature
@@ -135,22 +135,13 @@ Feature: Import a WordPress database
     Then the wp_cli_test.sql file should exist
 
     When I try `wp db import --defaults --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-auto-rehash#
 
     When I try `wp db import --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#
 
     When I try `wp db import --no-defaults --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#
 
   @require-wp-4.2
   Scenario: Import db that has emoji in post
diff --git a/features/db-query.feature b/features/db-query.feature
index 627ef534..3deb13fc 100644
--- a/features/db-query.feature
+++ b/features/db-query.feature
@@ -76,22 +76,13 @@ Feature: Query the database with WordPress' MySQL config
     Given a WP install
 
   When I try `wp db query --defaults --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-auto-rehash#
 
     When I try `wp db query --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#
 
     When I try `wp db query --no-defaults --debug`
-    Then STDERR should contain:
-      """
-      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
-      """
+    Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#
 
   Scenario: SQL modes do not include any of the modes incompatible with WordPress
     Given a WP install
diff --git a/src/DB_Command.php b/src/DB_Command.php
index 117b5992..fe4d0f49 100644
--- a/src/DB_Command.php
+++ b/src/DB_Command.php
@@ -252,7 +252,7 @@ public function check( $_, $assoc_args ) {
 
 		$command = sprintf(
 			'/usr/bin/env %s%s %s',
-			$this->get_check_command(),
+			Utils\get_sql_check_command(),
 			$this->get_defaults_flag_string( $assoc_args ),
 			'%s'
 		);
@@ -300,7 +300,7 @@ public function check( $_, $assoc_args ) {
 	public function optimize( $_, $assoc_args ) {
 		$command = sprintf(
 			'/usr/bin/env %s%s %s',
-			$this->get_check_command(),
+			Utils\get_sql_check_command(),
 			$this->get_defaults_flag_string( $assoc_args ),
 			'%s'
 		);
@@ -348,7 +348,7 @@ public function optimize( $_, $assoc_args ) {
 	public function repair( $_, $assoc_args ) {
 		$command = sprintf(
 			'/usr/bin/env %s%s %s',
-			$this->get_check_command(),
+			Utils\get_sql_check_command(),
 			$this->get_defaults_flag_string( $assoc_args ),
 			'%s'
 		);
@@ -397,7 +397,11 @@ public function repair( $_, $assoc_args ) {
 	 */
 	public function cli( $_, $assoc_args ) {
 
-		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
+		$command = sprintf(
+			'/usr/bin/env %s%s --no-auto-rehash',
+			$this->get_mysql_command(),
+			$this->get_defaults_flag_string( $assoc_args )
+		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		if ( ! isset( $assoc_args['database'] ) ) {
@@ -496,7 +500,11 @@ public function cli( $_, $assoc_args ) {
 	 */
 	public function query( $args, $assoc_args ) {
 
-		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
+		$command = sprintf(
+			'/usr/bin/env %s%s --no-auto-rehash',
+			$this->get_mysql_command(),
+			$this->get_defaults_flag_string( $assoc_args )
+		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['database'] = DB_NAME;
@@ -642,7 +650,7 @@ public function export( $args, $assoc_args ) {
 			$assoc_args['result-file'] = $result_file;
 		}
 
-		$mysqldump_binary = Utils\force_env_on_nix_systems( $this->get_dump_command() );
+		$mysqldump_binary = Utils\force_env_on_nix_systems( Utils\get_sql_dump_command() );
 
 		$support_column_statistics = exec( $mysqldump_binary . ' --help | grep "column-statistics"' );
 
@@ -732,7 +740,8 @@ private function get_posts_table_charset( $assoc_args ) {
 
 		list( $stdout, $stderr, $exit_code ) = self::run(
 			sprintf(
-				'/usr/bin/env mysql%s --no-auto-rehash --batch --skip-column-names',
+				'%s%s --no-auto-rehash --batch --skip-column-names',
+				$this->get_mysql_command(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			[ 'execute' => $query ],
@@ -819,7 +828,11 @@ public function import( $args, $assoc_args ) {
 			$result_file = 'STDIN';
 		}
 
-		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
+		$command = sprintf(
+			'/usr/bin/env %s%s --no-auto-rehash',
+			$this->get_mysql_command(),
+			$this->get_defaults_flag_string( $assoc_args )
+		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
@@ -1752,7 +1765,8 @@ protected function run_query( $query, $assoc_args = [] ) {
 
 		self::run(
 			sprintf(
-				'/usr/bin/env mysql%s --no-auto-rehash',
+				'%s%s --no-auto-rehash',
+				$this->get_mysql_command(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			array_merge( [ 'execute' => $query ], $mysql_args )
@@ -2152,7 +2166,8 @@ protected function get_current_sql_modes( $assoc_args ) {
 
 			list( $stdout, $stderr, $exit_code ) = self::run(
 				sprintf(
-					'/usr/bin/env mysql%s --no-auto-rehash --batch --skip-column-names',
+					'%s%s --no-auto-rehash --batch --skip-column-names',
+					$this->get_mysql_command(),
 					$this->get_defaults_flag_string( $assoc_args )
 				),
 				array_merge( $args, [ 'execute' => 'SELECT @@SESSION.sql_mode' ] ),
@@ -2185,20 +2200,11 @@ protected function get_current_sql_modes( $assoc_args ) {
 	}
 
 	/**
-	 * Returns the correct `check` command based on the detected database type.
+	 * Returns the correct `mysql` command based on the detected database type.
 	 *
 	 * @return string The appropriate check command.
 	 */
-	private function get_check_command() {
-		return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-check' : 'mysqlcheck';
-	}
-
-	/**
-	 * Returns the correct `dump` command based on the detected database type.
-	 *
-	 * @return string The appropriate dump command.
-	 */
-	private function get_dump_command() {
-		return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-dump' : 'mysqldump';
+	private function get_mysql_command() {
+		return 'mariadb' === Utils\get_db_type() ? 'mariadb' : 'mysql';
 	}
 }