diff --git a/docker-compose.yml b/docker-compose.yml
index 4a2644c9042..d9d28c42598 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -219,6 +219,7 @@ services:
       context: ./cron
       args:
         BASE_IMAGE: "$SENTRY_IMAGE"
+    entrypoint: "/entrypoint.sh"
     command: '"0 0 * * * gosu sentry sentry cleanup --days $SENTRY_EVENT_RETENTION_DAYS"'
   nginx:
     <<: *restart_policy
diff --git a/test.sh b/test.sh
index b4028dc5188..4c6ca2fead7 100755
--- a/test.sh
+++ b/test.sh
@@ -113,3 +113,7 @@ do
   echo "Pass."
 done
 echo "::endgroup::"
+
+echo "::group::Ensure cleanup crons are working ..."
+docker-compose ps | grep -q -- "-cleanup_.\+[[:space:]]\+Up[[:space:]]\+"
+echo "::endgroup::"