1 files changed, 18 insertions, 0 deletions
diff --git a/test/segments/context.spec b/test/segments/context.spec
index 07300370..25c355a7 100755
--- a/test/segments/context.spec
+++ b/test/segments/context.spec
@@ -11,11 +11,29 @@ function setUp() {
   # Test specific settings
   OLD_DEFAULT_USER=$DEFAULT_USER
   unset DEFAULT_USER
+
+  # Fix leaked state for travis
+  OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW=$POWERLEVEL9K_CONTEXT_ALWAYS_SHOW
+  unset POWERLEVEL9K_CONTEXT_ALWAYS_SHOW
+  OLD_SSH_CLIENT=$SSH_CLIENT
+  unset SSH_CLIENT
+  OLD_SSH_TTY=$SSH_TTY
+  unset SSH_TTY
 }
 
 function tearDown() {
   # Restore old variables
   [[ -n "$OLD_DEFAULT_USER" ]] && DEFAULT_USER=$OLD_DEFAULT_USER
+  unset OLD_DEFAULT_USER
+
+  [[ -n "$OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW" ]] && POWERLEVEL9K_CONTEXT_ALWAYS_SHOW=$OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW
+  unset OLD_POWERLEVEL9K_CONTEXT_ALWAYS_SHOW
+
+  [[ -n "$OLD_SSH_CLIENT" ]] && SSH_CLIENT=$OLD_SSH_CLIENT
+  unset OLD_SSH_CLIENT
+
+  [[ -n "$OLD_SSH_TTY" ]] && SSH_TTY=$OLD_SSH_TTY
+  unset OLD_SSH_TTY
 
   return 0
 }