diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats
index 3c1aa0f9..152f247d 100644
--- a/tests/integration/app_deploy.bats
+++ b/tests/integration/app_deploy.bats
@@ -22,6 +22,8 @@ setup(){
 teardown(){
   _reset_recipe
   _undeploy_app
+  _undeploy_app2 "gitea.$TEST_SERVER"
+
   _reset_app
   _reset_tags
 
@@ -222,19 +224,6 @@ teardown(){
   run $ABRA app deploy "gitea.$TEST_SERVER" --no-input --no-converge-checks
   assert_success
   assert_output --partial "$latestVersion"
-
-  run $ABRA app undeploy "gitea.$TEST_SERVER" --no-input
-  assert_success
-
-  run $ABRA app secret remove "gitea.$TEST_SERVER" --all --no-input
-  assert_success
-
-  run $ABRA app volume remove "gitea.$TEST_SERVER" --no-input
-  assert_success
-
-  run $ABRA app remove "gitea.$TEST_SERVER" --no-input
-  assert_success
-  assert_not_exists "$ABRA_DIR/servers/$TEST_SERVER/gitea.$TEST_SERVER.env"
 }
 
 # bats test_tags=slow
diff --git a/tests/integration/helpers/app.bash b/tests/integration/helpers/app.bash
index 89958586..c9da3294 100644
--- a/tests/integration/helpers/app.bash
+++ b/tests/integration/helpers/app.bash
@@ -30,6 +30,15 @@ _undeploy_app() {
   assert_output --partial 'unknown'
 }
 
+_undeploy_app2() {
+  run $ABRA app undeploy "$1" --no-input
+
+  run $ABRA app ls --server "$TEST_SERVER" --status
+  assert_success
+  assert_output --partial "$1"
+  assert_output --partial 'unknown'
+}
+
 _rm_app() {
   # NOTE(d1): not asserting outcomes on teardown here since some might fail
   # depending on what the test created. all commands run through anyway
diff --git a/tests/integration/helpers/git.bash b/tests/integration/helpers/git.bash
index 637136f8..e88128dd 100644
--- a/tests/integration/helpers/git.bash
+++ b/tests/integration/helpers/git.bash
@@ -38,6 +38,8 @@ _set_git_author() {
 }
 
 _git_commit() {
+  _set_git_author
+
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" add .
   assert_success