diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 94b6c7f72..6699f2add 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -70,7 +70,7 @@ jobs:
         run: make all compress
       - name: Run tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test --stepwise -vv -p no:sugar --cov=./ --cov-report=xml tests
+        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test --stepwise -vv -p no:sugar --cov=./ --cov-report=xml --reruns 0 tests
       - name: Run concurrency tests
         working-directory: ./src
         run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b354c958f..487eec308 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ tests:
         - cd src
         - python manage.py check
         - make all compress
-        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test -n 3 tests --maxfail=100
+        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100
     except:
         - pypi
 pypi:
diff --git a/src/tests/api/test_order_change.py b/src/tests/api/test_order_change.py
index ca271e123..f40fb520c 100644
--- a/src/tests/api/test_order_change.py
+++ b/src/tests/api/test_order_change.py
@@ -451,7 +451,7 @@ def test_order_create_invoice(token_client, organizer, event, order):
         "invoice_to_vat_id": "DE123",
         "invoice_to_beneficiary": "",
         "custom_field": None,
-        'date': now().date().isoformat(),
+        'date': now().astimezone(event.timezone).date().isoformat(),
         'refers': None,
         'locale': 'en',
         'introductory_text': '',