diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index b2f7f24c2..e2963dfb9 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -1,6 +1,6 @@
 version: '3.5'
 
-## Integration Environment for Drone CI
+## Continuous Integration (CI) Test Environment
 services:
   ## App Dev Container
   ## Docs: https://docs.photoprism.app/developer-guide/
diff --git a/scripts/test.sh b/scripts/test.sh
index 787e79cb7..9f1f751f5 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -7,7 +7,6 @@ scripts/docker/login.sh
 
 # Run tests
 docker-compose -f docker-compose.ci.yml pull
-docker-compose -f docker-compose.ci.yml stop
-docker-compose -f docker-compose.ci.yml up -d --build --force-recreate
-docker-compose -f docker-compose.ci.yml exec -T photoprism make all test install migrate
-docker-compose -f docker-compose.ci.yml down
+docker-compose -f docker-compose.ci.yml build
+trap "docker rm -f -v photoprism-test " INT TERM
+docker-compose -f docker-compose.ci.yml run --name photoprism-test --rm -T photoprism make all test install migrate