diff --git a/test/diff/submodule-editor-diffstat-test b/test/diff/submodule-editor-diffstat-test
index 5780eaad8..c74e40f40 100755
--- a/test/diff/submodule-editor-diffstat-test
+++ b/test/diff/submodule-editor-diffstat-test
@@ -73,9 +73,9 @@ include/api.h
 EOF
 
 assert_equals 'exec-env' <<EOF
- - pwd=ROOT/work dir/repo-two-a
- - git-dir=ROOT/work dir/.git/modules/repo-two-a
+ - pwd=ROOT/work-dir/repo-two-a
+ - git-dir=ROOT/work-dir/.git/modules/repo-two-a
  - show-cdup=
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 EOF
diff --git a/test/diff/submodule-editor-test b/test/diff/submodule-editor-test
index 6b1f9a510..ff8a88747 100755
--- a/test/diff/submodule-editor-test
+++ b/test/diff/submodule-editor-test
@@ -360,33 +360,33 @@ EOF
 
 assert_equals 'exec-env' <<EOF
 default
- - pwd=ROOT/work dir/bench
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 sub-directory
- - pwd=ROOT/work dir/bench/some/subdir
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench/some/subdir
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=../../
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 sub-directory::exec
- - pwd=ROOT/work dir/bench
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 sub-directory-diffstat
- - pwd=ROOT/work dir/bench/some/subdir
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench/some/subdir
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=../../
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 sub-directory-diffstat::exec
- - pwd=ROOT/work dir/bench
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 EOF
diff --git a/test/diff/worktree-editor-test b/test/diff/worktree-editor-test
index 8bcaff4e1..303b7d857 100755
--- a/test/diff/worktree-editor-test
+++ b/test/diff/worktree-editor-test
@@ -355,38 +355,38 @@ EOF
 
 assert_equals 'exec-env' <<EOF
 default
- - pwd=ROOT/work dir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 default::exec
- - pwd=ROOT/work dir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 sub-directory
- - pwd=ROOT/work dir/some/subdir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir/some/subdir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=../../
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 sub-directory::exec
- - pwd=ROOT/work dir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 sub-directory-diffstat
- - pwd=ROOT/work dir/some/subdir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir/some/subdir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=../../
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 sub-directory-diffstat::exec
- - pwd=ROOT/work dir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=
  - is-inside-work-tree=true
  - show-superproject-working-tree=
diff --git a/test/main/git-alias-test b/test/main/git-alias-test
index d6536ac82..d928817ce 100755
--- a/test/main/git-alias-test
+++ b/test/main/git-alias-test
@@ -43,8 +43,8 @@ test_tig -- src/main/scala
 in_work_dir git alias-vars
 
 assert_equals 'alias-vars' <<EOF
-PWD=ROOT/work dir
-GIT_DIR=ROOT/base/.git/worktrees/work dir
+PWD=ROOT/work-dir
+GIT_DIR=ROOT/base/.git/worktrees/work-dir
 GIT_PREFIX=deltablue/
 EOF
 
diff --git a/test/tools/libtest.sh b/test/tools/libtest.sh
index 0e7dba7ab..7692b6699 100644
--- a/test/tools/libtest.sh
+++ b/test/tools/libtest.sh
@@ -28,7 +28,7 @@ prefix_dir="$(printf '%s\n' "$source_dir" | sed -n 's#\(.*/test/\)\([/].*\)*#\2#
 output_dir="$base_dir/tmp/$prefix_dir/$test"
 tmp_dir="$base_dir/tmp"
 output_dir="$tmp_dir/$prefix_dir/$test"
-work_dir="work dir"
+work_dir="work-dir"
 tty_attrs="$(stty -g </dev/tty)"
 
 # The locale must specify UTF-8 for Ncurses to output correctly. Since C.UTF-8
diff --git a/test/tree/submodule-editor-test b/test/tree/submodule-editor-test
index 04e3ee8a2..3aa3ffb8d 100755
--- a/test/tree/submodule-editor-test
+++ b/test/tree/submodule-editor-test
@@ -98,15 +98,15 @@ EOF
 
 assert_equals 'exec-env' <<EOF
 start
- - pwd=ROOT/work dir/bench/common/src
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench/common/src
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=../../
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 end
- - pwd=ROOT/work dir/bench
- - git-dir=ROOT/work dir/.git/modules/bench
+ - pwd=ROOT/work-dir/bench
+ - git-dir=ROOT/work-dir/.git/modules/bench
  - show-cdup=
  - is-inside-work-tree=true
- - show-superproject-working-tree=ROOT/work dir
+ - show-superproject-working-tree=ROOT/work-dir
 EOF
diff --git a/test/tree/worktree-editor-test b/test/tree/worktree-editor-test
index 846108232..c168de605 100755
--- a/test/tree/worktree-editor-test
+++ b/test/tree/worktree-editor-test
@@ -95,14 +95,14 @@ EOF
 
 assert_equals 'exec-env' <<EOF
 start
- - pwd=ROOT/work dir/common/src
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir/common/src
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=../../
  - is-inside-work-tree=true
  - show-superproject-working-tree=
 end
- - pwd=ROOT/work dir
- - git-dir=ROOT/base/.git/worktrees/work dir
+ - pwd=ROOT/work-dir
+ - git-dir=ROOT/base/.git/worktrees/work-dir
  - show-cdup=
  - is-inside-work-tree=true
  - show-superproject-working-tree=