diff --git a/makefile b/makefile
index 65f5383..0e742e5 100644
--- a/makefile
+++ b/makefile
@@ -21,11 +21,11 @@ testReport:
 		npm run testReport 
 
 teste:
-		docker build docker -t barra-govbr-image
-		docker run -dit -p 80:80 --name barra-govbr barra-govbr-image
-# TODO usar trap para EXIT
-		npm run test || (docker rm -f barra-govbr &&	docker rmi -f barra-govbr-image)
-		docker rm -f barra-govbr && docker rmi -f barra-govbr-image
+		trap 'docker rm -f barra-govbr && docker rmi -f barra-govbr-image' EXIT && \
+		docker build docker -t barra-govbr-image && \
+		docker run -dit -p 80:80 --name barra-govbr barra-govbr-image && \
+		npm run test
+
 
 
 		
--
libgit2 0.21.2