autoenv.zsh             | 2 +-
 tests/cwd.t             | 2 +-
 tests/leave.t           | 8 ++++----
 tests/recurse-upwards.t | 4 ++--

diff --git a/autoenv.zsh b/autoenv.zsh
index d3f0f2efb9c19f74d573f558214a31473f4d76a6..d35b344d16f1efe3e49cfe5a266cf488d3e65f39 100644
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -9,7 +9,7 @@ : ${AUTOENV_FILE_ENTER:=.env}
 
 # Name of file to look for when leaving directories.
 # Requires AUTOENV_HANDLE_LEAVE=1.
-: ${AUTOENV_FILE_LEAVE:=.env.leave}
+: ${AUTOENV_FILE_LEAVE:=.env_leave}
 
 # Look for .env in parent dirs?
 : ${AUTOENV_LOOK_UPWARDS:=1}
diff --git a/tests/cwd.t b/tests/cwd.t
index 4c02fbfed9579ab71163c8d4be172c0027f533bb..07ab881f465b89b329c1c38eacd9effe9bbb62fe 100644
--- a/tests/cwd.t
+++ b/tests/cwd.t
@@ -8,7 +8,7 @@   $ AUTOENV_LOOK_UPWARDS=1
   $ mkdir -p sub/sub2
   $ cd sub
   $ echo 'echo ENTERED: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env
-  $ echo 'echo LEFT: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env.leave
+  $ echo 'echo LEFT: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env_leave
 
 Manually create auth files.
 
diff --git a/tests/leave.t b/tests/leave.t
index 62b7b8dcd073933803ac8bd86d601f1c45132d1e..7b804661c77d4960d6fd9d2467e5ab93a3961217 100644
--- a/tests/leave.t
+++ b/tests/leave.t
@@ -5,7 +5,7 @@
   $ mkdir sub
   $ cd sub
   $ echo 'echo ENTERED' > .env
-  $ echo 'echo LEFT' > .env.leave
+  $ echo 'echo LEFT' > .env_leave
 
 Change to the directory.
 
@@ -29,7 +29,7 @@
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd ..
   Attempting to load unauthorized env file!
-  -* /tmp/cramtests-*/leave.t/sub/.env.leave (glob)
+  -* /tmp/cramtests-*/leave.t/sub/.env_leave (glob)
   
   **********************************************
   
@@ -45,7 +45,7 @@   ENTERED
   $ _autoenv_ask_for_yes() { echo "yes"; return 0 }
   $ cd ..
   Attempting to load unauthorized env file!
-  -* /tmp/cramtests-*/leave.t/sub/.env.leave (glob)
+  -* /tmp/cramtests-*/leave.t/sub/.env_leave (glob)
   
   **********************************************
   
@@ -98,7 +98,7 @@   LEFT
   $ mkdir outside
   $ cd outside
   $ echo 'echo ENTERED outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env
-  $ echo 'echo LEFT outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env.leave
+  $ echo 'echo LEFT outside: PWD:${PWD:t} pwd:${${"$(pwd)"}:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env_leave
   $ test_autoenv_auth_env_files
 
   $ cd ..
diff --git a/tests/recurse-upwards.t b/tests/recurse-upwards.t
index 229429343e3e647260d1d30c09fe7d4c9fb9c332..ff4fce65ba130d7c43213d4c5982683e7acfd823 100644
--- a/tests/recurse-upwards.t
+++ b/tests/recurse-upwards.t
@@ -9,7 +9,7 @@
 Create env files in root dir.
 
   $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
   $ test_autoenv_auth_env_files
 
 Create env files in sub dir.
@@ -19,7 +19,7 @@   $ cd sub
   ENTERED_root: PWD:sub from:recurse-upwards.t to:sub
 
   $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
   $ test_autoenv_auth_env_files
 
 The actual tests.