diff --git a/config/database.json.sample b/config/database.json.sample
index ae39fd6..221ebdd 100644
--- a/config/database.json.sample
+++ b/config/database.json.sample
@@ -18,7 +18,7 @@
 		"password": "password"
 	},
 	"test": {
-		"db_name": "luaonbeans_tests",
+		"db_name": "luaonbeans_test",
 		"url": "http://127.0.0.1:8529",
 		"username": "root",
 		"password": "password"
diff --git a/docker-compose.yml b/docker-compose.yml
index b5fd7c0..903f355 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,12 +7,19 @@ services:
       - 7000:8080
     environment:
       BEANS_ENV: production
+    depends_on:
+      arangodb:
+        condition: service_healthy
 
   arangodb:
     image: arangodb:latest
-    restart: always
     environment:
       ARANGO_ROOT_PASSWORD: password
+    healthcheck:
+      test: wget -qO- http://localhost:8529
+      interval: 100ms
+      timeout: 1s
+      retries: 2
     ports:
       - 8529:8529
     volumes: