diff --git a/.travis.yml b/.travis.yml
index 9836688..7f5c8a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,12 @@ language: generic
 sudo: false
 env:
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR
-  - ZSH=4 ZDOTDIR=tests/ZDOTDIR.clobber
+  - ZSH=4 ZDOTDIR=tests/ZDOTDIR.options
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.loadviafunction
 
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR
-  - ZSH=5 ZDOTDIR=tests/ZDOTDIR.clobber
+  - ZSH=5 ZDOTDIR=tests/ZDOTDIR.options
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.loadviafunction
 
diff --git a/tests/ZDOTDIR.clobber/.zshenv b/tests/ZDOTDIR.options/.zshenv
similarity index 50%
rename from tests/ZDOTDIR.clobber/.zshenv
rename to tests/ZDOTDIR.options/.zshenv
index 84c8c22..df23e53 100644
--- a/tests/ZDOTDIR.clobber/.zshenv
+++ b/tests/ZDOTDIR.options/.zshenv
@@ -1,4 +1,6 @@
 # Source base setup.
 source ${ZDOTDIR}/../ZDOTDIR/.zshenv
 
+# Set uncommon options that caused problems in the past.
 setopt noclobber
+setopt shwordsplit