   [app services cli-data & body]
   `(ks-testutils/with-no-jvm-shutdown-hooks
      (let [~app (bootstrap-services-with-cli-data ~services ~cli-data)]
-      ~@body
-      (tk-app/stop ~app))))
+       (try
+         ~@body
+         (finally
+           (tk-app/stop ~app))))))
 
 (defn bootstrap-services-with-cli-args
   [services cli-args]

  [app services & body]
  `(ks-testutils/with-no-jvm-shutdown-hooks
     (let [~app (bootstrap-services-with-empty-config ~services)]
       ~@body
       (tk-app/stop ~app))))

(defn bootstrap-with-empty-config
  ([]

  [app services config & body]
  `(ks-testutils/with-no-jvm-shutdown-hooks
     (let [~app (tk/boot-services-with-config ~services ~config)]
       (try
         ~@body
         (finally
           (tk-app/stop ~app))))))

(defn bootstrap-services-with-cli-data
  [services cli-data]
