diff --git a/test/support/apps/phx1_7/bin/test b/test/support/apps/phx1_7/bin/test
index f376ba1d..4f1be344 100755
--- a/test/support/apps/phx1_7/bin/test
+++ b/test/support/apps/phx1_7/bin/test
@@ -13,6 +13,10 @@ function cleanup() {
     rm -rf lib/phx1_7_web/views/post_view.ex
     rm -rf test/phx1_7_web/controllers/post_controller_test.exs
     rm -rf test/support/fixtures/
+    rm -rf lib/phx1_7_web/components/layouts/torch.html.heex
+    rm -rf lib/phx1_7_web/controllers/post_html.ex
+    rm -rf lib/phx1_7_web/controllers/post_html/
+
     patch -i ../../patches/install-torch.diff -p 1 -R
     patch -i ../../patches/install-route.diff -p 1 -R
 }
@@ -22,8 +26,8 @@ mix deps.get || { cleanup; echo 'Dependencies could not be fetched!'; exit 1; }
 MIX_ENV=test mix ecto.drop || { cleanup; echo 'Database could not be dropped'; exit 1; }
 MIX_ENV=test mix torch.install || { cleanup; echo 'Torch could not be installed!'; exit 1; }
 MIX_ENV=test mix torch.gen.html Blog Post posts title:string published:boolean published_at:datetime views:integer || { echo 'Torch files not generated!'; exit 1; }
-MIX_ENV=test mix ecto.setup ||  { cleanup; echo 'Torch database could not be setup!'; exit 1; }
 patch -i ../../patches/install-route.diff -p 1
+MIX_ENV=test mix ecto.setup ||  { cleanup; echo 'Torch database could not be setup!'; exit 1; }
 MIX_ENV=test mix test || { echo 'Tests failed!'; cleanup; exit 1; }
 
 # Ensure that put_root_layout is used by default on > Phx 1.5