diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc
index 11945e6606a..25d0068cec0 100644
--- a/mysql-test/include/mysqld--help.inc
+++ b/mysql-test/include/mysqld--help.inc
@@ -10,12 +10,11 @@
 exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1;
 
 perl;
-  @skipvars=qw/basedir character-sets-dir datadir
-               general-log-file language lc-messages-dir
-               log log-slow-queries pid-file plugin-dir slave-load-tmpdir
-               slow-query-log-file tmpdir open-files-limit/;
+  @skipvars=qw/basedir open-files-limit general-log-file log
+               log-slow-queries pid-file slow-query-log-file/;
   @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool
-              thread-concurrency super-large-pages/;
+              thread-concurrency super-large-pages mutex-deadlock-detector/;
+  @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/;
   $re1=join('|', @skipvars, @plugins);
   $re2=join('|', @plugins);
   $skip=0;
@@ -27,9 +26,11 @@ perl;
     $skip=0 if /^  -/;
     $skip=1 if / --($re2)\b/;
     # fixes for 32-bit
+    y!\\!/!;
     s/\b4294967295\b/18446744073709551615/;
     s/\b2146435072\b/9223372036853727232/;
     s/\b196608\b/262144/;
+    foreach $var (@env) { s/$ENV{$var}/$var/ }
     next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
     next if $skip;
     print;
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 623b4a119e4..85c0ea7bd6c 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -744,12 +744,14 @@ bulk-insert-buffer-size             8388608
 character-set-client-handshake      TRUE
 character-set-filesystem            binary
 character-set-server                latin1
+character-sets-dir                  MYSQL_SHAREDIR/charsets/
 chroot                              (No default value)
 collation-server                    latin1_swedish_ci
 completion-type                     NO_CHAIN
 concurrent-insert                   AUTO
 connect-timeout                     10
 console                             FALSE
+datadir                             MYSQLTEST_VARDIR/install.db/
 date-format                         %Y-%m-%d
 datetime-format                     %Y-%m-%d %H:%i:%s
 default-character-set               latin1
@@ -793,8 +795,10 @@ key-buffer-size                     8388608
 key-cache-age-threshold             300
 key-cache-block-size                1024
 key-cache-division-limit            100
+language                            MYSQL_SHAREDIR/
 large-pages                         FALSE
 lc-messages                         en_US
+lc-messages-dir                     MYSQL_SHAREDIR/
 lc-time-names                       en_US
 local-infile                        TRUE
 log-bin                             (No default value)
@@ -861,6 +865,7 @@ optimizer-prune-level               1
 optimizer-search-depth              62
 optimizer-switch                    index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
 partition                           ON
+plugin-dir                          MYSQL_LIBDIR/mysql/plugin
 plugin-load                         (No default value)
 port                                3306
 port-open-timeout                   0
@@ -901,6 +906,7 @@ skip-show-database                  FALSE
 skip-slave-start                    FALSE
 slave-compressed-protocol           FALSE
 slave-exec-mode                     STRICT
+slave-load-tmpdir                   MYSQLTEST_VARDIR/tmp/
 slave-net-timeout                   3600
 slave-skip-errors                   (No default value)
 slave-transaction-retries           10
@@ -934,6 +940,7 @@ thread-stack                        262144
 time-format                         %H:%i:%s
 timed-mutexes                       FALSE
 tmp-table-size                      16777216
+tmpdir                              MYSQLTEST_VARDIR/tmp/
 transaction-alloc-block-size        8192
 transaction-isolation               REPEATABLE-READ
 transaction-prealloc-size           4096
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index ec621d72bef..4f705156c60 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -748,12 +748,14 @@ bulk-insert-buffer-size           8388608
 character-set-client-handshake    TRUE
 character-set-filesystem          binary
 character-set-server              latin1
+character-sets-dir                MYSQL_SHAREDIR/charsets/
 chroot                            (No default value)
 collation-server                  latin1_swedish_ci
 completion-type                   NO_CHAIN
 concurrent-insert                 AUTO
 connect-timeout                   10
 console                           FALSE
+datadir                           MYSQLTEST_VARDIR/install.db/
 date-format                       %Y-%m-%d
 datetime-format                   %Y-%m-%d %H:%i:%s
 default-character-set             latin1
@@ -797,7 +799,9 @@ key-buffer-size                   8388608
 key-cache-age-threshold           300
 key-cache-block-size              1024
 key-cache-division-limit          100
+language                          MYSQL_SHAREDIR/
 lc-messages                       en_US
+lc-messages-dir                   MYSQL_SHAREDIR/
 lc-time-names                     en_US
 local-infile                      TRUE
 log-bin                           (No default value)
@@ -865,6 +869,7 @@ optimizer-prune-level             1
 optimizer-search-depth            62
 optimizer-switch                  index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
 partition                         ON
+plugin-dir                        MYSQL_LIBDIR/plugin
 plugin-load                       (No default value)
 port                              3306
 port-open-timeout                 0
@@ -907,6 +912,7 @@ skip-show-database                FALSE
 skip-slave-start                  FALSE
 slave-compressed-protocol         FALSE
 slave-exec-mode                   STRICT
+slave-load-tmpdir                 MYSQLTEST_VARDIR/tmp/
 slave-net-timeout                 3600
 slave-skip-errors                 (No default value)
 slave-transaction-retries         10
@@ -940,6 +946,7 @@ thread-stack                      262144
 time-format                       %H:%i:%s
 timed-mutexes                     FALSE
 tmp-table-size                    16777216
+tmpdir                            MYSQLTEST_VARDIR/tmp/
 transaction-alloc-block-size      8192
 transaction-isolation             REPEATABLE-READ
 transaction-prealloc-size         4096