diff --git a/dotfiles/lib/shellenv.sh b/dotfiles/lib/shellenv.sh
index 8a1c7a6f..01ff199a 100644
--- a/dotfiles/lib/shellenv.sh
+++ b/dotfiles/lib/shellenv.sh
@@ -1,8 +1,5 @@
 source "$HOME/.lib/shellpath.sh"
 
-test -r ~/.customenv.sh && source ~/.customenv.sh
-source_if_exists ~/.this-machine-env.sh
-
 environment_variable_exists ENVIRONMENT_SETUP_DONE || _setup_env
 
 # TODO(imalison): These need to run every time because of how their
@@ -19,3 +16,6 @@ environment_variable_exists ENVIRONMENT_SETUP_DONE || _setup_env
 _python_setup
 
 source_directory_files "$HOME/.lib/shellenv"
+
+test -r ~/.customenv.sh && source ~/.customenv.sh
+source_if_exists ~/.this-machine-env.sh