diff --git a/test/fzf/test.sh b/test/fzf/test.sh
index 4bd6b68..cbc9112 100644
--- a/test/fzf/test.sh
+++ b/test/fzf/test.sh
@@ -6,19 +6,19 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "check for fzf" fzf --version
+check "check for fzf" sudo -u "$_REMOTE_USER" fzf --version
 
 # Depending on the shell (bash, zsh, fish), check if the config was added to the profiles
 if [ -n "$BASH_VERSION" ]; then
-    check "check for fzf key bindings and fuzzy completion for bash" grep -q 'eval "$(fzf --bash)"' "${USER_HOME}/.bashrc"
+    check "check for fzf key bindings and fuzzy completion for bash" grep -q 'eval "$(fzf --bash)"' "${_REMOTE_USER_HOME}/.bashrc"
 fi
 
 if [ -n "$ZSH_VERSION" ]; then
-    check "check for fzf key bindings and fuzzy completion for zsh" grep -q 'source <(fzf --zsh)' "${USER_HOME}/.zshrc"
+    check "check for fzf key bindings and fuzzy completion for zsh" grep -q 'source <(fzf --zsh)' "${_REMOTE_USER_HOME}/.zshrc"
 fi
 
 if [ -n "$FISH_VERSION" ]; then
-    check "check for fzf key bindings for fish" grep -q 'fzf --fish | source' "${USER_HOME}/.config/fish/config.fish"
+    check "check for fzf key bindings for fish" grep -q 'fzf --fish | source' "${_REMOTE_USER_HOME}/.config/fish/config.fish"
 fi
 
 # Report result
diff --git a/test/spaceship/test.sh b/test/spaceship/test.sh
index a027c9a..d8def1c 100644
--- a/test/spaceship/test.sh
+++ b/test/spaceship/test.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "check for spaceship" grep -q 'spaceship-prompt' ~/.zshrc
+check "check for spaceship" sudo -u "$_REMOTE_USER" spaceship --version
 
 # Report result
 reportResults
\ No newline at end of file