diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f6a5e74..6863fc80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,6 +227,6 @@ test_bullseye_latestphp:
   after_script:
     - mkdir -p apache2_log
     - cp -r /var/log/apache2 apache2_log/test_bullseye_latestphp
-    - bzip2 apache2_log/test_bullseye_latestphp/*
+    - bzip2 apache2_log/test_bullseye_latestphp/* || true
     - mkdir -p davical_log
     - cp -r /var/log/davical davical_log/test_bullseye_latestphp
diff --git a/inc/always.php.in b/inc/always.php.in
index c8c84c78..2fc13485 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -109,11 +109,11 @@ function early_catch_fatal_error() {
 register_shutdown_function('early_catch_fatal_error');
 
 $c->default_timezone = ini_get ( 'date.timezone' );
-if (empty ( $c->default_timezone )) {
+if (isset ( $_SERVER ['HTTP_X_DAVICAL_TESTCASE'] ) ) {
+    $c->default_timezone = 'Pacific/Auckland';
+}
+else if (empty ( $c->default_timezone )) {
     $c->default_timezone = 'UTC';
-    if (isset ( $_SERVER ['HTTP_X_DAVICAL_TESTCASE'] )) {
-        $c->default_timezone = 'Pacific/Auckland';
-    }
 }
 
 // Default some of the configurable values