diff --git a/.github/lsan-suppressions.txt b/.github/lsan-suppressions.txt
index b8f863ce603b0..b5dbc26afddf8 100644
--- a/.github/lsan-suppressions.txt
+++ b/.github/lsan-suppressions.txt
@@ -1,3 +1,4 @@
 leak:acommon::DictInfoList::elements
 leak:timer_create
 leak:netsnmp_init_mib_internals
+leak:isc_attach_database
diff --git a/ext/pdo_firebird/tests/attr_datetime_format.phpt b/ext/pdo_firebird/tests/attr_datetime_format.phpt
index 6daa6cd66705f..f783fa3475b8a 100644
--- a/ext/pdo_firebird/tests/attr_datetime_format.phpt
+++ b/ext/pdo_firebird/tests/attr_datetime_format.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: attr date, time, and timestamp formats
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/autocommit.phpt b/ext/pdo_firebird/tests/autocommit.phpt
index 5b431859bf85d..3f4f7e8f370f8 100644
--- a/ext/pdo_firebird/tests/autocommit.phpt
+++ b/ext/pdo_firebird/tests/autocommit.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: auto commit
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 /* Part of the error messages probably vary depending on the version of Firebird,
diff --git a/ext/pdo_firebird/tests/autocommit_change_mode.phpt b/ext/pdo_firebird/tests/autocommit_change_mode.phpt
index 0ccc38f623929..8a7f0933203fa 100644
--- a/ext/pdo_firebird/tests/autocommit_change_mode.phpt
+++ b/ext/pdo_firebird/tests/autocommit_change_mode.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: change auto commit
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/bug_15604.phpt b/ext/pdo_firebird/tests/bug_15604.phpt
index 2a31d29e7b8cc..ea54390be1a6d 100644
--- a/ext/pdo_firebird/tests/bug_15604.phpt
+++ b/ext/pdo_firebird/tests/bug_15604.phpt
@@ -4,9 +4,6 @@ Bug #15604 It is not possible to pass a NULL value as an input parameter if the
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require_once 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_47415.phpt b/ext/pdo_firebird/tests/bug_47415.phpt
index 0889403f419b8..9fe63ea1c2d43 100644
--- a/ext/pdo_firebird/tests/bug_47415.phpt
+++ b/ext/pdo_firebird/tests/bug_47415.phpt
@@ -4,9 +4,6 @@ Bug #47415 PDO_Firebird segfaults when passing lowercased column name to bindCol
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_48877.phpt b/ext/pdo_firebird/tests/bug_48877.phpt
index 04e14a7ce312e..926f0ef207915 100644
--- a/ext/pdo_firebird/tests/bug_48877.phpt
+++ b/ext/pdo_firebird/tests/bug_48877.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: bug 48877 The "bindValue" and "bindParam" do not work for PDO Fire
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_53280.phpt b/ext/pdo_firebird/tests/bug_53280.phpt
index 6accc81e585cd..c62d348681d57 100644
--- a/ext/pdo_firebird/tests/bug_53280.phpt
+++ b/ext/pdo_firebird/tests/bug_53280.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: bug 53280 segfaults if query column count is less than param count
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
index 8cbeab61b85ae..b210aa8459cfe 100644
--- a/ext/pdo_firebird/tests/bug_62024.phpt
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -4,9 +4,6 @@ Bug #62024 Cannot insert second row with null using parametrized query (Firebird
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
index c7b1a327c15c5..290bd47699831 100644
--- a/ext/pdo_firebird/tests/bug_64037.phpt
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -4,9 +4,6 @@ Bug #64037 Firebird return wrong value for numeric field
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_72583.phpt b/ext/pdo_firebird/tests/bug_72583.phpt
index b86f40c7e2289..9d7a7efb03f8d 100644
--- a/ext/pdo_firebird/tests/bug_72583.phpt
+++ b/ext/pdo_firebird/tests/bug_72583.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: Feature 72583 Fetch integers as php integers not as strings
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_72931.phpt b/ext/pdo_firebird/tests/bug_72931.phpt
index c54779973206f..a6a77e0db5cea 100644
--- a/ext/pdo_firebird/tests/bug_72931.phpt
+++ b/ext/pdo_firebird/tests/bug_72931.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: Bug 72931 Insert returning fails on Firebird 3
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_73087.phpt b/ext/pdo_firebird/tests/bug_73087.phpt
index 182cf920737e2..70a5b34f7ffe7 100644
--- a/ext/pdo_firebird/tests/bug_73087.phpt
+++ b/ext/pdo_firebird/tests/bug_73087.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: bug 73087 segfault binding blob parameter
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_74462.phpt b/ext/pdo_firebird/tests/bug_74462.phpt
index e63ca1f6a7c72..26b1f35666424 100644
--- a/ext/pdo_firebird/tests/bug_74462.phpt
+++ b/ext/pdo_firebird/tests/bug_74462.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: Bug #74462 Returns only NULLs for boolean fields
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_76448.phpt b/ext/pdo_firebird/tests/bug_76448.phpt
index af19736842f69..083fcf55b1866 100644
--- a/ext/pdo_firebird/tests/bug_76448.phpt
+++ b/ext/pdo_firebird/tests/bug_76448.phpt
@@ -3,9 +3,6 @@ Bug #76448 (Stack buffer overflow in firebird_info_cb)
 --EXTENSIONS--
 pdo_firebird
 sockets
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip 64-bit only"); ?>
 --FILE--
diff --git a/ext/pdo_firebird/tests/bug_76449.phpt b/ext/pdo_firebird/tests/bug_76449.phpt
index 0636fbf6e21e0..9b2a6c7bcfcf2 100644
--- a/ext/pdo_firebird/tests/bug_76449.phpt
+++ b/ext/pdo_firebird/tests/bug_76449.phpt
@@ -3,9 +3,6 @@ Bug #76449 (SIGSEGV in firebird_handle_doer)
 --EXTENSIONS--
 pdo_firebird
 sockets
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require_once "payload_server.inc";
diff --git a/ext/pdo_firebird/tests/bug_76450.phpt b/ext/pdo_firebird/tests/bug_76450.phpt
index 68caf4842eb30..fcad1ccae7d74 100644
--- a/ext/pdo_firebird/tests/bug_76450.phpt
+++ b/ext/pdo_firebird/tests/bug_76450.phpt
@@ -3,9 +3,6 @@ Bug #76450 (SIGSEGV in firebird_stmt_execute)
 --EXTENSIONS--
 pdo_firebird
 sockets
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require_once "payload_server.inc";
diff --git a/ext/pdo_firebird/tests/bug_76452.phpt b/ext/pdo_firebird/tests/bug_76452.phpt
index ff37cedb661d9..fffc0bee5196e 100644
--- a/ext/pdo_firebird/tests/bug_76452.phpt
+++ b/ext/pdo_firebird/tests/bug_76452.phpt
@@ -4,9 +4,6 @@ Bug ##76452 (Crash while parsing blob data in firebird_fetch_blob)
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require_once "payload_server.inc";
diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt
index 4427e8c972bc3..8937a4cc59b56 100644
--- a/ext/pdo_firebird/tests/bug_76488.phpt
+++ b/ext/pdo_firebird/tests/bug_76488.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: Bug #76488 Memory leak when fetching a BLOB field
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_77863.phpt b/ext/pdo_firebird/tests/bug_77863.phpt
index 8a59e7a7a0308..44ffcc09d75b7 100644
--- a/ext/pdo_firebird/tests/bug_77863.phpt
+++ b/ext/pdo_firebird/tests/bug_77863.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: Bug #76488 PDO Firebird does not support boolean datatype in input
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_80521.phpt b/ext/pdo_firebird/tests/bug_80521.phpt
index cc97b4855e727..0a58ca72d82ea 100644
--- a/ext/pdo_firebird/tests/bug_80521.phpt
+++ b/ext/pdo_firebird/tests/bug_80521.phpt
@@ -4,9 +4,6 @@ Bug #80521 (Parameters with underscores no longer recognized)
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_aaa.phpt b/ext/pdo_firebird/tests/bug_aaa.phpt
index 6e4e40db0209a..f98fdae90ea51 100644
--- a/ext/pdo_firebird/tests/bug_aaa.phpt
+++ b/ext/pdo_firebird/tests/bug_aaa.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: cursor should not be marked as opened on singleton statements
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/common.phpt b/ext/pdo_firebird/tests/common.phpt
index 9ca2c4bb22762..6a89f2c957f62 100644
--- a/ext/pdo_firebird/tests/common.phpt
+++ b/ext/pdo_firebird/tests/common.phpt
@@ -9,8 +9,6 @@ pdo_firebird
 # magic auto-configuration
 
 $config = array(
-    // A bug in firebird causes a memory leak when calling `isc_attach_database()`. See https://github.com/FirebirdSQL/firebird/issues/7849
-	'ENV' => ['LSAN_OPTIONS' => 'detect_leaks=0'],
 	'TESTS' => 'ext/pdo/tests'
 );
 	
diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt
index cd92c36d98ecc..c1caac6216b2a 100644
--- a/ext/pdo_firebird/tests/connect.phpt
+++ b/ext/pdo_firebird/tests/connect.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: connect/disconnect
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
     require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index c90dd512b0aff..2f1abc67d3fbc 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: DDL/transactions
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/ddl2.phpt b/ext/pdo_firebird/tests/ddl2.phpt
index 1ca78bfb1fbef..6dac6b32dd168 100644
--- a/ext/pdo_firebird/tests/ddl2.phpt
+++ b/ext/pdo_firebird/tests/ddl2.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: DDL/transactions 2
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/dialect_1.phpt b/ext/pdo_firebird/tests/dialect_1.phpt
index 8df6f84d692f2..c08b37bf552c1 100644
--- a/ext/pdo_firebird/tests/dialect_1.phpt
+++ b/ext/pdo_firebird/tests/dialect_1.phpt
@@ -8,9 +8,6 @@ if (strpos(getenv('PDO_FIREBIRD_TEST_DSN'), 'dialect=1')===false) {
     die('skip: PDO_FIREBIRD_TEST_DSN must contain a string "dialect=1"');
 }
 ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/error_handle.phpt b/ext/pdo_firebird/tests/error_handle.phpt
index b042263f6d19f..50ff8677fe312 100644
--- a/ext/pdo_firebird/tests/error_handle.phpt
+++ b/ext/pdo_firebird/tests/error_handle.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: error handle
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt
index 3d9976f0f955c..464c8c29a9c44 100644
--- a/ext/pdo_firebird/tests/execute.phpt
+++ b/ext/pdo_firebird/tests/execute.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: prepare/execute/binding
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/execute_block.phpt b/ext/pdo_firebird/tests/execute_block.phpt
index f8a3e80c859aa..2ba68eea3ee1c 100644
--- a/ext/pdo_firebird/tests/execute_block.phpt
+++ b/ext/pdo_firebird/tests/execute_block.phpt
@@ -5,9 +5,6 @@ pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); 	
 ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/fb4_datatypes.phpt b/ext/pdo_firebird/tests/fb4_datatypes.phpt
index 9056b21c5b565..2fb7a5a01c25f 100644
--- a/ext/pdo_firebird/tests/fb4_datatypes.phpt
+++ b/ext/pdo_firebird/tests/fb4_datatypes.phpt
@@ -15,9 +15,6 @@ if (!$data || !array_key_exists('VERSION', $data) || version_compare($data['VERS
 	die("skip Firebird Server version must be greater than or equal to 4.0.0");
 }
 ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/fb4_datatypes_params.phpt b/ext/pdo_firebird/tests/fb4_datatypes_params.phpt
index af43355ce8e8a..0bf4e8239efc1 100644
--- a/ext/pdo_firebird/tests/fb4_datatypes_params.phpt
+++ b/ext/pdo_firebird/tests/fb4_datatypes_params.phpt
@@ -15,9 +15,6 @@ if (!$data || !array_key_exists('VERSION', $data) || version_compare($data['VERS
 	die("skip Firebird Server version must be greater than or equal to 4.0.0");
 }
 ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/get_api_version.phpt b/ext/pdo_firebird/tests/get_api_version.phpt
index a8adccc0b2a4d..f8e44b5327bce 100644
--- a/ext/pdo_firebird/tests/get_api_version.phpt
+++ b/ext/pdo_firebird/tests/get_api_version.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: getApiVersion()
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 echo Pdo\Firebird::getApiVersion() . "\n";
diff --git a/ext/pdo_firebird/tests/gh10908.phpt b/ext/pdo_firebird/tests/gh10908.phpt
index 574e9cd5275fa..b4a69141c2a40 100644
--- a/ext/pdo_firebird/tests/gh10908.phpt
+++ b/ext/pdo_firebird/tests/gh10908.phpt
@@ -4,9 +4,6 @@ GH-10908 (Bus error with PDO Firebird on RPI with 64 bit kernel and 32 bit userl
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/gh13119.phpt b/ext/pdo_firebird/tests/gh13119.phpt
index 377917b31abd9..a4ac13b978210 100644
--- a/ext/pdo_firebird/tests/gh13119.phpt
+++ b/ext/pdo_firebird/tests/gh13119.phpt
@@ -4,9 +4,6 @@ GH-13119 (float, double value is incorrect)
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/gh8576.phpt b/ext/pdo_firebird/tests/gh8576.phpt
index 432cf605f7a48..732ab49d411cc 100644
--- a/ext/pdo_firebird/tests/gh8576.phpt
+++ b/ext/pdo_firebird/tests/gh8576.phpt
@@ -4,9 +4,6 @@ GH-8576 (Bad interpretation of length when char is UTF-8)
 pdo_firebird
 --SKIPIF--
 <?php require 'skipif.inc'; ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/ignore_parammarks.phpt b/ext/pdo_firebird/tests/ignore_parammarks.phpt
index ceb1b0ff57f35..af0459950d629 100644
--- a/ext/pdo_firebird/tests/ignore_parammarks.phpt
+++ b/ext/pdo_firebird/tests/ignore_parammarks.phpt
@@ -5,9 +5,6 @@ pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); 	
 ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/payload_test.phpt b/ext/pdo_firebird/tests/payload_test.phpt
index e119a4068f622..0f14223a765b4 100644
--- a/ext/pdo_firebird/tests/payload_test.phpt
+++ b/ext/pdo_firebird/tests/payload_test.phpt
@@ -3,9 +3,6 @@ FB payload server satisfies connection attempt
 --EXTENSIONS--
 pdo_firebird
 sockets
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require_once "payload_server.inc";
diff --git a/ext/pdo_firebird/tests/pdofirebird_001.phpt b/ext/pdo_firebird/tests/pdofirebird_001.phpt
index bdf14f7f271e6..70fc594dfbf5b 100644
--- a/ext/pdo_firebird/tests/pdofirebird_001.phpt
+++ b/ext/pdo_firebird/tests/pdofirebird_001.phpt
@@ -4,9 +4,6 @@ PDO_firebird subclass basic
 pdo_firebird
 --SKIPIF--
 <?php require(__DIR__ . '/skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/pdofirebird_002.phpt b/ext/pdo_firebird/tests/pdofirebird_002.phpt
index 09c8efa6aff27..e5a4f8b7c4a48 100644
--- a/ext/pdo_firebird/tests/pdofirebird_002.phpt
+++ b/ext/pdo_firebird/tests/pdofirebird_002.phpt
@@ -4,9 +4,6 @@ PDO_firebird connect through PDO::connect
 pdo_firebird
 --SKIPIF--
 <?php require(__DIR__ . '/skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/persistent_connect.phpt b/ext/pdo_firebird/tests/persistent_connect.phpt
index 1467bd31054a3..b88a4ad39a4ca 100644
--- a/ext/pdo_firebird/tests/persistent_connect.phpt
+++ b/ext/pdo_firebird/tests/persistent_connect.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: persistent connect test
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/rowCount.phpt b/ext/pdo_firebird/tests/rowCount.phpt
index e7e8dcd6c3c2e..c4b54401f2f4d 100644
--- a/ext/pdo_firebird/tests/rowCount.phpt
+++ b/ext/pdo_firebird/tests/rowCount.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: rowCount
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/setCursorAttribute.phpt b/ext/pdo_firebird/tests/setCursorAttribute.phpt
index 26fa55e91d21f..c14fbf627f60a 100644
--- a/ext/pdo_firebird/tests/setCursorAttribute.phpt
+++ b/ext/pdo_firebird/tests/setCursorAttribute.phpt
@@ -4,9 +4,6 @@ Throw value error if cursor name is too long
 pdo_firebird
 --SKIPIF--
 <?php require 'skipif.inc'; ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/transaction_access_mode.phpt b/ext/pdo_firebird/tests/transaction_access_mode.phpt
index 8eb3738ff47bf..8370e059dfb6a 100644
--- a/ext/pdo_firebird/tests/transaction_access_mode.phpt
+++ b/ext/pdo_firebird/tests/transaction_access_mode.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: transaction access mode
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/transaction_isolation_level_attr.phpt b/ext/pdo_firebird/tests/transaction_isolation_level_attr.phpt
index ac185b557f796..6bcb223e8b48a 100644
--- a/ext/pdo_firebird/tests/transaction_isolation_level_attr.phpt
+++ b/ext/pdo_firebird/tests/transaction_isolation_level_attr.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: transaction isolation level (Testing for setting attribute values)
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/transaction_isolation_level_behavior.phpt b/ext/pdo_firebird/tests/transaction_isolation_level_behavior.phpt
index 737ecf5d837ac..5b656e61e1e27 100644
--- a/ext/pdo_firebird/tests/transaction_isolation_level_behavior.phpt
+++ b/ext/pdo_firebird/tests/transaction_isolation_level_behavior.phpt
@@ -4,9 +4,6 @@ PDO_Firebird: transaction isolation level (Testing for behavior)
 pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
---XLEAK--
-A bug in firebird causes a memory leak when calling `isc_attach_database()`.
-See https://github.com/FirebirdSQL/firebird/issues/7849
 --FILE--
 <?php