diff --git a/tests/unit/30_buildpacks.bats b/tests/unit/30_buildpacks.bats
index a57a8b7df..b8e697c94 100644
--- a/tests/unit/30_buildpacks.bats
+++ b/tests/unit/30_buildpacks.bats
@@ -4,11 +4,9 @@ load test_helper
 
 setup() {
   global_setup
-  deploy_app
 }
 
 teardown() {
-  destroy_app
   global_teardown
 }
 
@@ -211,7 +209,6 @@ teardown() {
 }
 
 @test "(buildpacks) buildpacks deploy" {
-  destroy_app
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -230,4 +227,9 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+
+  run destroy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
 }