diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cfdae868..d2846cbd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -499,7 +499,6 @@ jobs:
           elif [ "${{ matrix.server-version }}" = "system-pic" ]; then
             export DBD_MARIADB_TESTHOST=embedded
             export DBD_MARIADB_TESTEMBDATADIR="$HOME/datadir"
-            export DBD_MARIADB_TESTEMBOPTIONS="--language=$HOME/mysql-server-core-5.5/usr/share/mysql/,--log-error=/dev/null"
           elif [ "${{ matrix.server-version }}" = "none" ]; then
             export DBD_MARIADB_TESTHOST=0.0.0.0
             export DBD_MARIADB_TESTPORT=0
@@ -508,7 +507,6 @@ jobs:
             export DBD_MARIADB_TESTPASSWORD=msandbox
             export DBD_MARIADB_TESTHOST=127.0.0.1
             export DBD_MARIADB_TESTPORT=3310
-            export DBD_MARIADB_TESTEMBOPTIONS="--language=`find $HOME/sandbox/* -name english | head -1 | sed 's/english//'`,--log-error=/dev/null"
           fi
           if [[ ${{ matrix.client-version }} =~ mysql-8 ]]; then
             export DBD_MARIADB_TESTAUTHPLUGIN=mysql_native_password
@@ -527,8 +525,10 @@ jobs:
             fi
           elif [ "${{ matrix.client-version }}" = "same-as-server" ] && [ "${{ matrix.server-version }}" != "system" ]; then
             export DBD_MARIADB_CONFIG="$HOME/mysql_config"
+            export DBD_MARIADB_TESTEMBOPTIONS="--language=`find $HOME/sandbox/* -name english | sed 's/english//'`,--log-error=/dev/null"
           elif [ "${{ matrix.client-version }}" = "system-pic" ]; then
             export DBD_MARIADB_CONFIG="$HOME/mysql_config_pic"
+            export DBD_MARIADB_TESTEMBOPTIONS="--language=$HOME/mysql-server-core-5.5/usr/share/mysql/,--log-error=/dev/null"
             export DBD_MARIADB_REQUIREEMBSUP=1
           fi
           export | sed 's/^declare -x //;s/="/=/;s/"$//' | grep '^DBD_MARIADB_' >> $GITHUB_ENV