.travis.yml                               | 4 ++--
 Makefile                                  | 4 ++--
 tests/ZDOTDIR.clobber/.zshenv             | 3 ---
 tests/ZDOTDIR.invalid-module_path/.zshenv | 3 ---
 tests/ZDOTDIR.loadviafunction/.zshenv     | 3 ---
 tests/ZDOTDIR.shwordsplit/.zshenv         | 4 ----
 tests/ZDOTDIR/.zshenv                     | 3 ---
 tests/setup.zsh                           | 5 ++++-

diff --git a/.travis.yml b/.travis.yml
index 98366887b8961c7c97846d3f78882eb1d58348ff..faf7d6b23d594367147c3735c1f3380d3ac20609 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: generic
 sudo: false
 env:
-  - ZSH=4 ZDOTDIR=tests/ZDOTDIR
+  - ZSH=4
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.clobber
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.loadviafunction
 
-  - ZSH=5 ZDOTDIR=tests/ZDOTDIR
+  - ZSH=5
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.clobber
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.loadviafunction
diff --git a/Makefile b/Makefile
index f398f888402c2b8a144aba1eda33a02e64c5e722..4b6c77edafd1a73fe1ae2b6c23a58f1211182b4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-# Default, can be overridden using "make test ZDOTDIR=...".
-ZDOTDIR:=${CURDIR}/tests/ZDOTDIR
+# Empty by default, can be overridden using "make test ZDOTDIR=…".
+ZDOTDIR:=
 # Make it absolute.
 override ZDOTDIR:=$(abspath $(ZDOTDIR))
 
diff --git a/tests/ZDOTDIR.clobber/.zshenv b/tests/ZDOTDIR.clobber/.zshenv
index 84c8c2245eb7dd0ceda93c06c1903b672b4d3efa..5518101c24bad135c224dcb7406b31539c2b79c6 100644
--- a/tests/ZDOTDIR.clobber/.zshenv
+++ b/tests/ZDOTDIR.clobber/.zshenv
@@ -1,4 +1 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
 setopt noclobber
diff --git a/tests/ZDOTDIR.invalid-module_path/.zshenv b/tests/ZDOTDIR.invalid-module_path/.zshenv
index 90f1bd1dcfa68c76e5380b68808390977edd3dc6..ec3e341a1c3758cdbd001bde274e88b33782247e 100644
--- a/tests/ZDOTDIR.invalid-module_path/.zshenv
+++ b/tests/ZDOTDIR.invalid-module_path/.zshenv
@@ -9,6 +9,3 @@
 zstat() {
   echo "Should not get called."
 }
-
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
diff --git a/tests/ZDOTDIR.loadviafunction/.zshenv b/tests/ZDOTDIR.loadviafunction/.zshenv
index 9ff23713d0e710587ac6797da270356d31f0276a..7282797d329dfb246b032a2f89a12989f6053d82 100644
--- a/tests/ZDOTDIR.loadviafunction/.zshenv
+++ b/tests/ZDOTDIR.loadviafunction/.zshenv
@@ -1,6 +1,3 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
 antigen-like-loader-function() {
   source "$TESTDIR/../autoenv.plugin.zsh"
 }
diff --git a/tests/ZDOTDIR.shwordsplit/.zshenv b/tests/ZDOTDIR.shwordsplit/.zshenv
deleted file mode 100644
index f0394b2988f8abfc0e94ab7b6bb563fc07cdccff..0000000000000000000000000000000000000000
--- a/tests/ZDOTDIR.shwordsplit/.zshenv
+++ /dev/null
@@ -1,4 +0,0 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
-setopt shwordsplit
diff --git a/tests/ZDOTDIR/.zshenv b/tests/ZDOTDIR/.zshenv
deleted file mode 100644
index d99243d7813f6ccb726d2e660c40d5d578e371d9..0000000000000000000000000000000000000000
--- a/tests/ZDOTDIR/.zshenv
+++ /dev/null
@@ -1,3 +0,0 @@
-# Base setup/config.
-
-TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
diff --git a/tests/setup.zsh b/tests/setup.zsh
index 9b24765ea61452f171d51fae7bf17272e4110f30..9b15bf1db0ca3ab22b56096e39e7e21d275cbfa2 100644
--- a/tests/setup.zsh
+++ b/tests/setup.zsh
@@ -15,7 +15,10 @@ # Abort this setup script on any error.
 _save_errexit=${options[errexit]}
 set -e
 
-# Defined in .zshenv, e.g. tests/ZDOTDIR/.zshenv.
+# Can be defined in .zshenv, e.g. tests/ZDOTDIR.loadviafunction/.zshenv.
+if [[ -z $TEST_SOURCE_AUTOENV ]]; then
+  TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
+fi
 $TEST_SOURCE_AUTOENV
 
 # Reset any authentication.