diff --git a/t.sh b/t.sh
index 08f181f5942..b49a916ee24 100755
--- a/t.sh
+++ b/t.sh
@@ -10,9 +10,6 @@ if type realpath >/dev/null 2>&1 ; then
 fi
 
 # Generate the test keys and certs necessary for the integration tests.
-docker compose run bsetup
+docker compose run --rm bsetup
 
-# Use a predictable name for the container so we can grab the logs later
-# for use when testing logs analysis tools.
-docker rm boulder_tests || true
-exec docker compose run --name boulder_tests boulder ./test.sh "$@"
+exec docker compose run --rm --name boulder_tests boulder ./test.sh "$@"
diff --git a/tn.sh b/tn.sh
index a3cda08221c..665e3a59bb2 100755
--- a/tn.sh
+++ b/tn.sh
@@ -10,9 +10,6 @@ if type realpath >/dev/null 2>&1 ; then
 fi
 
 # Generate the test keys and certs necessary for the integration tests.
-docker compose run bsetup
+docker compose run --rm bsetup
 
-# Use a predictable name for the container so we can grab the logs later
-# for use when testing logs analysis tools.
-docker rm boulder_tests || true
-exec docker compose -f docker-compose.yml -f docker-compose.next.yml run boulder ./test.sh "$@"
+exec docker compose -f docker-compose.yml -f docker-compose.next.yml run --rm --name boulder_tests boulder ./test.sh "$@"