diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ba3f38f7170..f71031b79fa 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   Grunt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checking out code
@@ -54,11 +54,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             php: 7.3
             extensions:
             db: mysqli
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             php: 8.0
             db: pgsql
             extensions: xmlrpc-beta
@@ -111,4 +111,5 @@ jobs:
       - name: Running PHPUnit tests
         env:
           dbtype: ${{ matrix.db }}
-        run: vendor/bin/phpunit -v
+          phpunit_options: ${{ secrets.phpunit_options }}
+        run: vendor/bin/phpunit $phpunit_options