diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 036da7efa..d5a8795e2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   test:
     name: PHP ${{ matrix.php }}
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -27,7 +27,6 @@ jobs:
         include:
           - php: "8.0"
             experimental: true
-            runs-on: ubuntu-20.04
 
     env:
       MYSQL_USER: "zftest"
diff --git a/tests/Zend/Translate/Adapter/QtTest.php b/tests/Zend/Translate/Adapter/QtTest.php
index f55a02b9e..a0e1b40c1 100644
--- a/tests/Zend/Translate/Adapter/QtTest.php
+++ b/tests/Zend/Translate/Adapter/QtTest.php
@@ -62,7 +62,7 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_Qt(dirname(__FILE__) . '/_files/failed.ts', 'en');
             $this->fail("exception expected");
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Mismatched tag at line', $e->getMessage());
+            $this->assertContains('Mismatched tag at line', $e->getMessage(), '', true);
         }
     }
 
diff --git a/tests/Zend/Translate/Adapter/TbxTest.php b/tests/Zend/Translate/Adapter/TbxTest.php
index 031ca96c6..1135037bc 100644
--- a/tests/Zend/Translate/Adapter/TbxTest.php
+++ b/tests/Zend/Translate/Adapter/TbxTest.php
@@ -62,7 +62,7 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_Tbx(dirname(__FILE__) . '/_files/failed.tbx', 'en');
             $this->fail("exception expected");
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Mismatched tag at line', $e->getMessage());
+            $this->assertContains('Mismatched tag at line', $e->getMessage(), '', true);
         }
     }
 
diff --git a/tests/Zend/Translate/Adapter/TmxTest.php b/tests/Zend/Translate/Adapter/TmxTest.php
index 5a8fed681..716482e71 100644
--- a/tests/Zend/Translate/Adapter/TmxTest.php
+++ b/tests/Zend/Translate/Adapter/TmxTest.php
@@ -62,7 +62,7 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_Tmx(dirname(__FILE__) . '/_files/failed.tmx', 'en');
             $this->fail("exception expected");
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Mismatched tag at line', $e->getMessage());
+            $this->assertContains('Mismatched tag at line', $e->getMessage(), '', true);
         }
     }
     
diff --git a/tests/Zend/Translate/Adapter/XliffTest.php b/tests/Zend/Translate/Adapter/XliffTest.php
index 4f8a9d64f..cab40cef3 100644
--- a/tests/Zend/Translate/Adapter/XliffTest.php
+++ b/tests/Zend/Translate/Adapter/XliffTest.php
@@ -62,7 +62,7 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_Xliff(dirname(__FILE__) . '/_files/failed.xliff', 'en');
             $this->fail("exception expected");
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Mismatched tag at line', $e->getMessage());
+            $this->assertContains('Mismatched tag at line', $e->getMessage(), '', true);
         }
     }
     
diff --git a/tests/Zend/Translate/Adapter/XmlTmTest.php b/tests/Zend/Translate/Adapter/XmlTmTest.php
index 514ca0095..d75b62d45 100644
--- a/tests/Zend/Translate/Adapter/XmlTmTest.php
+++ b/tests/Zend/Translate/Adapter/XmlTmTest.php
@@ -62,7 +62,7 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_XmlTm(dirname(__FILE__) . '/_files/failed.xmltm', 'en');
             $this->fail("exception expected");
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Mismatched tag at line', $e->getMessage());
+            $this->assertContains('Mismatched tag at line', $e->getMessage(), '', true);
         }
     }