diff --git a/.travis.sh b/.travis.sh
index 16f17f5c..06d98d09 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -36,7 +36,7 @@ if [[ ${TRAVIS_OS_NAME} = osx ]]; then
     export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
 elif [[ ${TRAVIS_OS_NAME} = linux ]]; then
-    export PATH="/usr/lib/llvm-9/bin:${PATH}"
+    export PATH="/usr/lib/llvm-11/bin:${PATH}"
 fi
 
 echo "New \${PATH}:"
diff --git a/.travis.yml b/.travis.yml
index f4e74bad..46731949 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
 language: cpp
 os:
   - linux
-dist: trusty
+dist: bionic
 
 git:
   depth: 50
@@ -57,11 +57,13 @@ addons:
     brewfile: true
   apt:
     sources:
-      - llvm-toolchain-trusty
+      - sourceline: "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
+        key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
       - ubuntu-toolchain-r-test
     packages:
-      - clang-9
-      - clang-format-9
+      # NOTE: Please note the version-specific ${PATH} extension for clang in .travis.sh
+      - clang-11
+      - clang-format-11
       - cmake
       - cppcheck
       - docbook2x
@@ -71,7 +73,8 @@ addons:
       - lzip
       - mingw-w64
       - moreutils
-      - wine
+      - wine-stable
+      - wine32
 
 script:
   - ./.travis.sh
diff --git a/expat/qa.sh b/expat/qa.sh
index 5dd39512..605559e8 100755
--- a/expat/qa.sh
+++ b/expat/qa.sh
@@ -126,12 +126,13 @@ run_tests() {
     esac
 
     if [[ ${CC} =~ mingw ]]; then
-        # NOTE: Filenames are hardcoded for Travis Ubuntu trusty, as of now
+        # NOTE: Filenames are hardcoded for Travis' Ubuntu Bionic, as of now
         for i in tests xmlwf ; do
+            mingw32_dir="$(ls -1d /usr/lib/gcc/i686-w64-mingw32/* | head -n1)"
             RUN ln -s \
                     /usr/i686-w64-mingw32/lib/libwinpthread-1.dll \
-                    /usr/lib/gcc/i686-w64-mingw32/*/libgcc_s_sjlj-1.dll \
-                    /usr/lib/gcc/i686-w64-mingw32/*/libstdc++-6.dll \
+                    "${mingw32_dir}"/libgcc_s_sjlj-1.dll \
+                    "${mingw32_dir}"/libstdc++-6.dll \
                     "$PWD"/libexpat{,w}.dll \
                     ${i}/
         done