diff --git a/script/cibuild b/script/cibuild
index 73d5ea084..4a35a3b45 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -22,7 +22,7 @@ export DATABASE_NAME=tracks_test
 
 $docker_compose build
 $docker_compose up -d
-script/poll-for-db
+script/poll-for-db $2
 
 # Leaving this in since it will be needed for Rails 5
 $docker_compose run web bin/rails db:environment:set RAILS_ENV=test || true
diff --git a/script/poll-for-db b/script/poll-for-db
index 69b41fae3..2e8383cab 100755
--- a/script/poll-for-db
+++ b/script/poll-for-db
@@ -2,7 +2,7 @@
 
 echo "==> Polling DB…"
 
-if [ "$DATABASE_TYPE" == "mysql" ]; then
+if [ "$1" == "mysql" ]; then
   appdir=$(cd $(dirname "$0")/.. && pwd)
   [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
 
diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml
index b6edacf0e..a16effe7f 100644
--- a/test-envs/docker-compose-mysql.yml
+++ b/test-envs/docker-compose-mysql.yml
@@ -11,7 +11,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: $DATABASE_NAME
       DATABASE_USERNAME: root
diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml
index 1e7e7a7dc..ddd54f881 100644
--- a/test-envs/docker-compose-postgres.yml
+++ b/test-envs/docker-compose-postgres.yml
@@ -11,7 +11,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: $DATABASE_NAME
       DATABASE_USERNAME: postgres
diff --git a/test-envs/docker-compose-sqlite.yml b/test-envs/docker-compose-sqlite.yml
index 18db5e685..e0ae6af38 100644
--- a/test-envs/docker-compose-sqlite.yml
+++ b/test-envs/docker-compose-sqlite.yml
@@ -6,7 +6,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: "/app/db/db.sqlite"
       DATABASE_TYPE: sqlite3