diff --git a/mysql-test/r/mysqld--defaults-file.result b/mysql-test/r/mysqld--defaults-file.result
index be62580c47e..ccad1d119fc 100644
--- a/mysql-test/r/mysqld--defaults-file.result
+++ b/mysql-test/r/mysqld--defaults-file.result
@@ -17,8 +17,6 @@ Fatal error in defaults handling. Program aborted
 # Test on `defaults-file`
 Default options are read from the following files in the given order:
 MYSQLTEST_VARDIR/my.cnf
-The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera
 # Test on `defaults-extra-file`
 Default options are read from the following files in the given order:
 <first-defaults> MYSQLTEST_VARDIR/my_test.cnf ~/.my.cnf 
-The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera
diff --git a/mysql-test/t/mysqld--defaults-file.test b/mysql-test/t/mysqld--defaults-file.test
index acc1cea5b8c..91d30eb1617 100644
--- a/mysql-test/t/mysqld--defaults-file.test
+++ b/mysql-test/t/mysqld--defaults-file.test
@@ -36,12 +36,12 @@ exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
 
 --echo # Test on `defaults-file`
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 2 'Default options are read';
+exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 1 'Default options are read';
 
 --echo # Test on `defaults-extra-file`
 # <first-defaults> = `/etc/my.cnf /etc/mysql/my.cnf`
 # Using sysconfdir configuration, we don't always have `/etc/mysql/my.cnf`, so replace them with a regex as well.
 copy_file $MYSQLTEST_VARDIR/my.cnf $MYSQLTEST_VARDIR/my_test.cnf;
 --replace_regex /.*my_test.cnf/<first-defaults> MYSQLTEST_VARDIR\/my_test.cnf/
-exec $MYSQLD --defaults-extra-file=$MYSQLTEST_VARDIR/my_test.cnf --help --verbose | grep -A 2 'Default options are read';
+exec $MYSQLD --defaults-extra-file=$MYSQLTEST_VARDIR/my_test.cnf --help --verbose | grep -A 1 'Default options are read';
 remove_file $MYSQLTEST_VARDIR/my_test.cnf;