diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index 0c62fe85b..c8bc1c5bd 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/201-ipc.bats b/test/system/201-ipc.bats
index dd56e96b8..1e3e068b9 100644
--- a/test/system/201-ipc.bats
+++ b/test/system/201-ipc.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/203-network.bats b/test/system/203-network.bats
index be94bf299..991983492 100644
--- a/test/system/203-network.bats
+++ b/test/system/203-network.bats
@@ -35,9 +35,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/206-user.bats b/test/system/206-user.bats
index 421b43ffe..23f9b7993 100644
--- a/test/system/206-user.bats
+++ b/test/system/206-user.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/210-ulimit.bats b/test/system/210-ulimit.bats
index 143d7ec29..c4413836d 100644
--- a/test/system/210-ulimit.bats
+++ b/test/system/210-ulimit.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
index 8f7a2d3e6..06af1379e 100644
--- a/test/system/211-dbus.bats
+++ b/test/system/211-dbus.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }
 
diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
index 022ce5e8c..a9eb49c5d 100644
--- a/test/system/220-environment-variables.bats
+++ b/test/system/220-environment-variables.bats
@@ -23,9 +23,11 @@ setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_containers
+  pushd "$HOME" || return 1
 }
 
 teardown() {
+  popd || return 1
   cleanup_containers
 }