diff --git a/.devilbox/www/include/lib/Postgres.php b/.devilbox/www/include/lib/Postgres.php
index 0da552df..c65aef5c 100644
--- a/.devilbox/www/include/lib/Postgres.php
+++ b/.devilbox/www/include/lib/Postgres.php
@@ -128,7 +128,8 @@ class Postgres
 		if ($database !== null) {
 			$link = pg_pconnect('host='.$host.' dbname='.$database.' user='.$user.' password='.$pass);
 		} else {
-			$link = pg_pconnect('host='.$host.' user='.$user.' password='.$pass);
+			// NOTE: using dbname=postgres prevents HHVM from segfaulting
+			$link = pg_pconnect('host='.$host.' dbname=postgres user='.$user.' password='.$pass);
 		}
 		error_reporting(-1);
 
diff --git a/.tests/.lib.sh b/.tests/.lib.sh
index 2f5db227..468c5427 100644
--- a/.tests/.lib.sh
+++ b/.tests/.lib.sh
@@ -91,6 +91,7 @@ wait_for() {
 	if [ "${#}" = "2" ]; then
 		if [ "${2}" = "1" ]; then
 			printf "wait "
+			# shellcheck disable=SC2034
 			for i in $(seq 1 "${_time}"); do
 				sleep 1
 				printf "."
@@ -377,7 +378,7 @@ debilbox_test() {
 	### Variables
 	###
 	_ret=0 # Final exit code
-	_oks=3 # Require this many [OK]'s on the page
+	_oks=4 # Require this many [OK]'s on the page
 
 
 	###
@@ -489,4 +490,4 @@ _test_curled_oks() {
 	else
 		return 0
 	fi
-}
\ No newline at end of file
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index b36ce865..c595d5c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
   # HTTP
   # ----------------------------------------
   httpd:
+    # TODO: remove latest, once it is ready for the next release
     image: cytopia/${HTTPD_SERVER}:latest
 
     # Manually build via `docker-compose build`
@@ -91,6 +92,9 @@ services:
       # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
       - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd:ro
 
+    depends_on:
+      - php
+
     links:
       # ---- Format: ----
       # SERVICE [ : ALIAS]
@@ -194,6 +198,10 @@ services:
       # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
       - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd
 
+    depends_on:
+      - mysql
+      - postgres
+
 
     links:
       # ---- Format: ----
@@ -206,6 +214,7 @@ services:
   # DATABASE
   # ----------------------------------------
   mysql:
+    # TODO: remove latest, once it is ready for the next release
     image: cytopia/${MYSQL_SERVER}:latest
 
     # Manually build via `docker-compose build`