diff --git a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
index 23ac8a0..0745c9f 100644
--- a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
+++ b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
@@ -156,12 +156,11 @@ public function testExceptionContainer() {
    * Tests the case when the database connection is gone.
    */
   public function testLostDatabaseConnection() {
+    $incorrect_username = $this->randomMachineName(32);
     switch ($this->container->get('database')->driver()) {
-      case 'mysql':
-        $this->expectedExceptionMessage = '[1045] Access denied for user';
-        break;
       case 'pgsql':
-        $this->expectedExceptionMessage = '[7] FATAL:  role';
+      case 'mysql':
+        $this->expectedExceptionMessage = $incorrect_username;
         break;
       default:
         // We can not carry out this test.
@@ -172,13 +171,13 @@ public function testLostDatabaseConnection() {
     // We simulate a broken database connection by rewrite settings.php to no
     // longer have the proper data.
     $settings['databases']['default']['default']['username'] = (object) array(
-      'value' => $this->randomMachineName(64),
+      'value' => $incorrect_username,
       'required' => TRUE,
     );
     $this->writeSettings($settings);
 
     $this->drupalGet('');
-    $this->assertRaw($this->expectedExceptionMessage);
+    $this->assertRaw('PDOException');
   }
 
   /**