diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 34798202..303a9656 100755
--- a/yesod/test/scaffold.sh
+++ b/yesod/test/scaffold.sh
@@ -1,3 +1,12 @@
-#!/bin/bash -x
+#!/bin/bash -ex
 
-rm -rf foobar && runghc main.hs init && cd foobar && cabal install && cabal install -fdevel && cd ..
+rm -rf foobar
+runghc main.hs init
+
+(
+  cd foobar
+  cabal install
+  cabal install -fdevel
+)
+
+ghc-pkg unregister foobar