diff --git a/test/system/002-help.bats b/test/system/002-help.bats
index 57e918a04..a8bfbc2c7 100644
--- a/test/system/002-help.bats
+++ b/test/system/002-help.bats
@@ -25,9 +25,11 @@ setup() {
   bats_require_minimum_version 1.10.0
   _setup_environment
   cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_all
 }
 
diff --git a/test/system/501-create.bats b/test/system/501-create.bats
index 3f50f98e6..cfb676b70 100644
--- a/test/system/501-create.bats
+++ b/test/system/501-create.bats
@@ -25,9 +25,11 @@ setup() {
   bats_require_minimum_version 1.8.0
   _setup_environment
   cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_all
 }
 
diff --git a/test/system/504-run.bats b/test/system/504-run.bats
index cc5f6fa8b..6ee3e86af 100644
--- a/test/system/504-run.bats
+++ b/test/system/504-run.bats
@@ -25,9 +25,11 @@ setup() {
   bats_require_minimum_version 1.8.0
   _setup_environment
   cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_all
 }
 
diff --git a/test/system/505-enter.bats b/test/system/505-enter.bats
index 405d184f1..57e586516 100644
--- a/test/system/505-enter.bats
+++ b/test/system/505-enter.bats
@@ -25,9 +25,11 @@ setup() {
   bats_require_minimum_version 1.8.0
   _setup_environment
   cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_all
 }