diff --git a/Makefile b/Makefile
index a16ac88..499ca72 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ distclean: clean
 .PHONY: up
 up: .require-license
 	docker-compose port connect 3939 2>/dev/null | if ! grep -q ':23939$$'; then \
-		docker-compose up -d; \
+		docker-compose up -d --wait; \
 	fi
 
 .PHONY: down
diff --git a/__tests__/rstudio-connect.test.gcfg b/__tests__/rstudio-connect.test.gcfg
index a6d82cb..64defc0 100644
--- a/__tests__/rstudio-connect.test.gcfg
+++ b/__tests__/rstudio-connect.test.gcfg
@@ -13,16 +13,12 @@ InsecureDefaultUserAPIKey = true
 APIKeyBcryptCost = 4
 
 [Database]
-Provider = Postgres
 SeedUsers = true
 
 [HTTP]
 Listen = :3939
 NoWarning = true
 
-[Postgres]
-URL = postgres://postgres:notasecret@db/postgres?sslmode=disable
-
 [Python]
 Enabled = true
 Executable = /opt/python/3.12.1/bin/python
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e924dd..403028b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,11 @@
 services:
-  db:
-    image: postgres:12
-    volumes:
-      - ./.cache/pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: notasecret
   connect:
     privileged: true
-    depends_on:
-      - db
     image: rstudio/rstudio-connect:ubuntu2204-2024.05.0
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3939/"]
+      start_period: 30s
+      start_interval: 1s
     volumes:
       - ./.cache/data:/data
       - ./__tests__/rstudio-connect.test.gcfg:/etc/rstudio-connect/rstudio-connect.gcfg