diff --git a/.github/workflows/ci-test-pr.yml b/.github/workflows/ci-test-pr.yml
index 62dd687f..26efcfc9 100644
--- a/.github/workflows/ci-test-pr.yml
+++ b/.github/workflows/ci-test-pr.yml
@@ -80,7 +80,7 @@ jobs:
     - name: Set up PR Tests
       id: setup-tests
       run: |
-        docker compose -f docker-test.yml exec -T pender test/setup-parallel
+        docker compose -f docker-test.yml exec -T -e DEPLOY_ENV=ci pender test/setup-parallel
 
     - name: Run PR Tests
       id: run-tests
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 0e025e64..daba92a9 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [ "${APP}" = 'pender' ] ; then
   port ${SERVER_PORT}
 EOF
 
-  if [ "${DEPLOY_ENV}" = 'local' ||  "${RAILS_ENV}" = 'test' ] ; then
+  if [ "${DEPLOY_ENV}" = 'local' ] || [ "${RAILS_ENV}" = 'test' ] ; then
     rm -f "${DIRPATH}/pids/server-${DEPLOY_ENV}.pid"
     bundle exec puma -C "${PUMA}"
   else # qa, live etc