diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 30fcaf853..659a0fc2e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         mongodb-version:
           - "4.4"
         topology:
diff --git a/tests/apm/commandFailedEvent-002.phpt b/tests/apm/commandFailedEvent-002.phpt
index e0a23ab86..dbe99a56b 100644
--- a/tests/apm/commandFailedEvent-002.phpt
+++ b/tests/apm/commandFailedEvent-002.phpt
@@ -12,6 +12,9 @@ $m = create_test_manager();
 
 class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
 {
+    private $startRequestId;
+    private $startOperationId;
+
     public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void
     {
         echo "started: ", $event->getCommandName(), "\n";
diff --git a/tests/apm/commandSucceededEvent-002.phpt b/tests/apm/commandSucceededEvent-002.phpt
index 1939d51c8..728e25bbf 100644
--- a/tests/apm/commandSucceededEvent-002.phpt
+++ b/tests/apm/commandSucceededEvent-002.phpt
@@ -12,6 +12,9 @@ $m = create_test_manager();
 
 class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
 {
+    private $startRequestId;
+    private $startOperationId;
+
     public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void
     {
         echo "started: ", $event->getCommandName(), "\n";
diff --git a/tests/bson/bson-binary-clone-001.phpt b/tests/bson/bson-binary-clone-001.phpt
index acae9b234..56dbd0faa 100644
--- a/tests/bson/bson-binary-clone-001.phpt
+++ b/tests/bson/bson-binary-clone-001.phpt
@@ -1,5 +1,8 @@
 --TEST--
-MongoDB\BSON\Binary can be cloned
+MongoDB\BSON\Binary can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
@@ -18,7 +21,6 @@ $types = array(
 foreach($types as $type) {
     // Use 16-byte data to satisfy UUID requirements
     $binary = new MongoDB\BSON\Binary('randomBinaryData', $type);
-    $binary->foo = 'bar';
 
     $clone = clone $binary;
 
@@ -28,7 +30,6 @@ foreach($types as $type) {
     unset($binary);
 
     var_dump($clone);
-    var_dump($clone->foo);
 }
 ?>
 ===DONE===
@@ -42,7 +43,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(0)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -51,7 +51,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(1)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -60,7 +59,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(2)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -69,7 +67,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(3)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -78,7 +75,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(4)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -87,7 +83,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(5)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -96,7 +91,6 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(128)
 }
-string(3) "bar"
 bool(true)
 bool(false)
 object(MongoDB\BSON\Binary)#%d (2) {
@@ -105,5 +99,4 @@ object(MongoDB\BSON\Binary)#%d (2) {
   ["type"]=>
   int(133)
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-binary-clone-002.phpt b/tests/bson/bson-binary-clone-002.phpt
new file mode 100644
index 000000000..69f7bd4e5
--- /dev/null
+++ b/tests/bson/bson-binary-clone-002.phpt
@@ -0,0 +1,102 @@
+--TEST--
+MongoDB\BSON\Binary can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$types = array(
+    MongoDB\BSON\Binary::TYPE_GENERIC,
+    MongoDB\BSON\Binary::TYPE_FUNCTION,
+    MongoDB\BSON\Binary::TYPE_OLD_BINARY,
+    MongoDB\BSON\Binary::TYPE_OLD_UUID,
+    MongoDB\BSON\Binary::TYPE_UUID,
+    MongoDB\BSON\Binary::TYPE_MD5,
+    MongoDB\BSON\Binary::TYPE_USER_DEFINED,
+    MongoDB\BSON\Binary::TYPE_USER_DEFINED+5,
+);
+foreach($types as $type) {
+    // Use 16-byte data to satisfy UUID requirements
+    $binary = new MongoDB\BSON\Binary('randomBinaryData', $type);
+
+    $clone = clone $binary;
+
+    var_dump($clone == $binary);
+    var_dump($clone === $binary);
+
+    unset($binary);
+
+    var_dump($clone);
+}
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(0)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(1)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(2)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(3)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(4)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(5)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(128)
+}
+bool(true)
+bool(false)
+object(MongoDB\BSON\Binary)#%d (2) {
+  ["data"]=>
+  string(16) "randomBinaryData"
+  ["type"]=>
+  int(133)
+}
+===DONE===
diff --git a/tests/bson/bson-binary-set_state-001.phpt b/tests/bson/bson-binary-set_state-001.phpt
index 81f591208..b7ac0b53b 100644
--- a/tests/bson/bson-binary-set_state-001.phpt
+++ b/tests/bson/bson-binary-set_state-001.phpt
@@ -25,27 +25,27 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Binary::__set_state(array(
+%r\\?%rMongoDB\BSON\Binary::__set_state(array(
 %w'data' => 'foobar',
 %w'type' => 0,
 ))
 
-MongoDB\BSON\Binary::__set_state(array(
+%r\\?%rMongoDB\BSON\Binary::__set_state(array(
 %w'data' => '',
 %w'type' => 0,
 ))
 
-MongoDB\BSON\Binary::__set_state(array(
+%r\\?%rMongoDB\BSON\Binary::__set_state(array(
 %w'data' => '' . "\0" . 'foo',
 %w'type' => 0,
 ))
 
-MongoDB\BSON\Binary::__set_state(array(
+%r\\?%rMongoDB\BSON\Binary::__set_state(array(
 %w'data' => '>Egè›Ó¤VBfUD' . "\0" . '' . "\0" . '',
 %w'type' => 4,
 ))
 
-MongoDB\BSON\Binary::__set_state(array(
+%r\\?%rMongoDB\BSON\Binary::__set_state(array(
 %w'data' => '8Xö"0¬<‘_0fCÆ?',
 %w'type' => 5,
 ))
diff --git a/tests/bson/bson-dbpointer-clone-001.phpt b/tests/bson/bson-dbpointer-clone-001.phpt
index 715121f6d..151b7a932 100644
--- a/tests/bson/bson-dbpointer-clone-001.phpt
+++ b/tests/bson/bson-dbpointer-clone-001.phpt
@@ -1,5 +1,8 @@
 --TEST--
-MongoDB\BSON\DBPointer can be cloned
+MongoDB\BSON\DBPointer can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
@@ -8,7 +11,6 @@ require_once __DIR__ . '/../utils/basic.inc';
 $test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" }  }} }'));
 
 $dbPointer = $test->dbref;
-$dbPointer->foo = 'bar';
 $clone = clone($dbPointer);
 
 var_dump($clone == $dbPointer);
@@ -17,7 +19,6 @@ var_dump($clone === $dbPointer);
 unset($dbPointer);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -30,5 +31,4 @@ object(MongoDB\BSON\DBPointer)#%d (2) {
   ["id"]=>
   string(24) "5a2e78accd485d55b405ac12"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-dbpointer-clone-002.phpt b/tests/bson/bson-dbpointer-clone-002.phpt
new file mode 100644
index 000000000..b55012cd9
--- /dev/null
+++ b/tests/bson/bson-dbpointer-clone-002.phpt
@@ -0,0 +1,34 @@
+--TEST--
+MongoDB\BSON\DBPointer can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" }  }} }'));
+
+$dbPointer = $test->dbref;
+$clone = clone($dbPointer);
+
+var_dump($clone == $dbPointer);
+var_dump($clone === $dbPointer);
+
+unset($dbPointer);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\DBPointer)#%d (2) {
+  ["ref"]=>
+  string(11) "phongo.test"
+  ["id"]=>
+  string(24) "5a2e78accd485d55b405ac12"
+}
+===DONE===
diff --git a/tests/bson/bson-decimal128-clone-001.phpt b/tests/bson/bson-decimal128-clone-001.phpt
index 42d417f7c..cdb5af41a 100644
--- a/tests/bson/bson-decimal128-clone-001.phpt
+++ b/tests/bson/bson-decimal128-clone-001.phpt
@@ -1,12 +1,13 @@
 --TEST--
-MongoDB\BSON\Decimal128 can be cloned
+MongoDB\BSON\Decimal128 can be cloned (PHP < 8.2)
 --SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--
 <?php
 
 $decimal = new MongoDB\BSON\Decimal128('1234.5678');
-$decimal->foo = 'bar';
 
 $clone = clone $decimal;
 
@@ -16,7 +17,6 @@ var_dump($clone === $decimal);
 unset($decimal);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -27,5 +27,4 @@ object(MongoDB\BSON\Decimal128)#%d (1) {
   ["dec"]=>
   string(9) "1234.5678"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-decimal128-clone-002.phpt b/tests/bson/bson-decimal128-clone-002.phpt
new file mode 100644
index 000000000..89cd687aa
--- /dev/null
+++ b/tests/bson/bson-decimal128-clone-002.phpt
@@ -0,0 +1,30 @@
+--TEST--
+MongoDB\BSON\Decimal128 can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
+--FILE--
+<?php
+
+$decimal = new MongoDB\BSON\Decimal128('1234.5678');
+
+$clone = clone $decimal;
+
+var_dump($clone == $decimal);
+var_dump($clone === $decimal);
+
+unset($decimal);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Decimal128)#%d (1) {
+  ["dec"]=>
+  string(9) "1234.5678"
+}
+===DONE===
diff --git a/tests/bson/bson-decimal128-set_state-001.phpt b/tests/bson/bson-decimal128-set_state-001.phpt
index 13ac2c1bc..adf64f0a9 100644
--- a/tests/bson/bson-decimal128-set_state-001.phpt
+++ b/tests/bson/bson-decimal128-set_state-001.phpt
@@ -25,27 +25,27 @@ foreach ($tests as $value) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => '1234.5678',
 ))
 
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => '-1234.5678',
 ))
 
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => 'Infinity',
 ))
 
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => 'Infinity',
 ))
 
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => 'NaN',
 ))
 
-MongoDB\BSON\Decimal128::__set_state(array(
+%r\\?%rMongoDB\BSON\Decimal128::__set_state(array(
 %w'dec' => 'NaN',
 ))
 
diff --git a/tests/bson/bson-encode-003.phpt b/tests/bson/bson-encode-003.phpt
index 4f5205905..4fb55fa69 100644
--- a/tests/bson/bson-encode-003.phpt
+++ b/tests/bson/bson-encode-003.phpt
@@ -6,6 +6,8 @@ BSON encoding: Encoding objects into BSON representation
 require_once __DIR__ . '/../utils/basic.inc';
 
 class MyClass implements MongoDB\BSON\Persistable {
+    private $props;
+
     #[\ReturnTypeWillChange]
     public function bsonSerialize() {
         return array(
@@ -18,6 +20,8 @@ class MyClass implements MongoDB\BSON\Persistable {
     }
 }
 class MyClass2 implements MongoDB\BSON\Persistable {
+    private $props;
+
     #[\ReturnTypeWillChange]
     public function bsonSerialize() {
         return array(
@@ -55,7 +59,7 @@ Test#0 { "stuff" : { "__pclass" : { "$binary" : "TXlDbGFzcw==", "$type" : "80" }
 object(stdClass)#%d (1) {
   ["stuff"]=>
   object(MyClass)#%d (1) {
-    ["props"]=>
+    ["props":"MyClass":private]=>
     array(3) {
       ["__pclass"]=>
       object(MongoDB\BSON\Binary)#%d (2) {
@@ -79,7 +83,7 @@ Test#1 { "stuff" : { "__pclass" : { "$binary" : "TXlDbGFzczI=", "$type" : "80" }
 object(stdClass)#%d (1) {
   ["stuff"]=>
   object(MyClass2)#%d (1) {
-    ["props"]=>
+    ["props":"MyClass2":private]=>
     array(4) {
       ["__pclass"]=>
       object(MongoDB\BSON\Binary)#%d (2) {
@@ -112,7 +116,7 @@ object(stdClass)#%d (1) {
   array(2) {
     [0]=>
     object(MyClass)#%d (1) {
-      ["props"]=>
+      ["props":"MyClass":private]=>
       array(3) {
         ["__pclass"]=>
         object(MongoDB\BSON\Binary)#%d (2) {
@@ -129,7 +133,7 @@ object(stdClass)#%d (1) {
     }
     [1]=>
     object(MyClass2)#%d (1) {
-      ["props"]=>
+      ["props":"MyClass2":private]=>
       array(4) {
         ["__pclass"]=>
         object(MongoDB\BSON\Binary)#%d (2) {
diff --git a/tests/bson/bson-int64-clone-001.phpt b/tests/bson/bson-int64-clone-001.phpt
index 5b045d494..369cd77fa 100644
--- a/tests/bson/bson-int64-clone-001.phpt
+++ b/tests/bson/bson-int64-clone-001.phpt
@@ -1,6 +1,8 @@
 --TEST--
-MongoDB\BSON\Int64 can be cloned
+MongoDB\BSON\Int64 can be cloned (PHP < 8.2)
 --SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 <?php if (4 !== PHP_INT_SIZE) { die('skip Only for 32-bit platform'); } ?>
 --FILE--
 <?php
@@ -8,7 +10,6 @@ MongoDB\BSON\Int64 can be cloned
 require_once __DIR__ . '/../utils/basic.inc';
 
 $int64 = unserialize('C:18:"MongoDB\BSON\Int64":47:{a:1:{s:7:"integer";s:19:"9223372036854775807";}}');
-$int64->foo = 'bar';
 $clone = clone $int64;
 
 var_dump($clone == $int64);
@@ -17,7 +18,6 @@ var_dump($clone === $int64);
 unset($int64);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -28,5 +28,4 @@ object(MongoDB\BSON\Int64)#%d (%d) {
   ["integer"]=>
   string(19) "9223372036854775807"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-int64-clone-002.phpt b/tests/bson/bson-int64-clone-002.phpt
new file mode 100644
index 000000000..e0b622de1
--- /dev/null
+++ b/tests/bson/bson-int64-clone-002.phpt
@@ -0,0 +1,31 @@
+--TEST--
+MongoDB\BSON\Int64 can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+<?php if (4 !== PHP_INT_SIZE) { die('skip Only for 32-bit platform'); } ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$int64 = unserialize('C:18:"MongoDB\BSON\Int64":47:{a:1:{s:7:"integer";s:19:"9223372036854775807";}}');
+$clone = clone $int64;
+
+var_dump($clone == $int64);
+var_dump($clone === $int64);
+
+unset($int64);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Int64)#%d (%d) {
+  ["integer"]=>
+  string(19) "9223372036854775807"
+}
+===DONE===
diff --git a/tests/bson/bson-javascript-clone-001.phpt b/tests/bson/bson-javascript-clone-001.phpt
index 3709a2873..583e7f158 100644
--- a/tests/bson/bson-javascript-clone-001.phpt
+++ b/tests/bson/bson-javascript-clone-001.phpt
@@ -1,12 +1,14 @@
 --TEST--
-MongoDB\BSON\Javascript can be cloned
+MongoDB\BSON\Javascript can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $javascript = new MongoDB\BSON\Javascript("function foo(bar) {var baz = bar; var bar = foo; return bar; }", ['foo' => 42]);
-$javascript->foo = 'bar';
 
 $clone = clone $javascript;
 
@@ -16,7 +18,6 @@ var_dump($clone === $javascript);
 unset($javascript);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -32,5 +33,4 @@ object(MongoDB\BSON\Javascript)#%d (%d) {
     int(42)
   }
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-javascript-clone-002.phpt b/tests/bson/bson-javascript-clone-002.phpt
new file mode 100644
index 000000000..cbbf65d7a
--- /dev/null
+++ b/tests/bson/bson-javascript-clone-002.phpt
@@ -0,0 +1,36 @@
+--TEST--
+MongoDB\BSON\Javascript can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$javascript = new MongoDB\BSON\Javascript("function foo(bar) {var baz = bar; var bar = foo; return bar; }", ['foo' => 42]);
+
+$clone = clone $javascript;
+
+var_dump($clone == $javascript);
+var_dump($clone === $javascript);
+
+unset($javascript);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Javascript)#%d (%d) {
+  ["code"]=>
+  string(62) "function foo(bar) {var baz = bar; var bar = foo; return bar; }"
+  ["scope"]=>
+  object(stdClass)#%d (%d) {
+    ["foo"]=>
+    int(42)
+  }
+}
+===DONE===
diff --git a/tests/bson/bson-javascript-set_state-001.phpt b/tests/bson/bson-javascript-set_state-001.phpt
index df7cf60a7..c20e75b93 100644
--- a/tests/bson/bson-javascript-set_state-001.phpt
+++ b/tests/bson/bson-javascript-set_state-001.phpt
@@ -30,19 +30,19 @@ echo "\n\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Javascript::__set_state(array(
+%r\\?%rMongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo(bar) { return bar; }',
 %w'scope' => NULL,
 ))
 
-MongoDB\BSON\Javascript::__set_state(array(
+%r\\?%rMongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo(bar) { return bar; }',
 %w'scope' => 
   %Sarray(
   %S),
 ))
 
-MongoDB\BSON\Javascript::__set_state(array(
+%r\\?%rMongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo() { return foo; }',
 %w'scope' => 
   %Sarray(
@@ -50,18 +50,18 @@ MongoDB\BSON\Javascript::__set_state(array(
   %S),
 ))
 
-MongoDB\BSON\Javascript::__set_state(array(
+%r\\?%rMongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo() { return id; }',
 %w'scope' => 
   %Sarray(
   %w'id' => 
-    MongoDB\BSON\ObjectId::__set_state(array(
+    %r\\?%rMongoDB\BSON\ObjectId::__set_state(array(
     %w'oid' => '53e2a1c40640fd72175d4603',
     )),
   %S),
 ))
 
-MongoDB\BSON\Javascript::__set_state(array(
+%r\\?%rMongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo(bar) { return bar; }',
 %w'scope' => NULL,
 ))
diff --git a/tests/bson/bson-maxkey-clone-001.phpt b/tests/bson/bson-maxkey-clone-001.phpt
index 6505c065a..23d84a769 100644
--- a/tests/bson/bson-maxkey-clone-001.phpt
+++ b/tests/bson/bson-maxkey-clone-001.phpt
@@ -1,23 +1,23 @@
 --TEST--
-MongoDB\BSON\MaxKey can be cloned
+MongoDB\BSON\MaxKey can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $maxKey = new MongoDB\BSON\MaxKey;
-$maxKey->foo = 'bar';
 
 $clone = clone $maxKey;
 
 var_dump($clone == $maxKey);
 var_dump($clone === $maxKey);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 bool(true)
 bool(false)
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-maxkey-clone-002.phpt b/tests/bson/bson-maxkey-clone-002.phpt
new file mode 100644
index 000000000..12cc3d4c5
--- /dev/null
+++ b/tests/bson/bson-maxkey-clone-002.phpt
@@ -0,0 +1,23 @@
+--TEST--
+MongoDB\BSON\MaxKey can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$maxKey = new MongoDB\BSON\MaxKey;
+
+$clone = clone $maxKey;
+
+var_dump($clone == $maxKey);
+var_dump($clone === $maxKey);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(true)
+bool(false)
+===DONE===
diff --git a/tests/bson/bson-maxkey-set_state-001.phpt b/tests/bson/bson-maxkey-set_state-001.phpt
index 214226cae..1b54d9636 100644
--- a/tests/bson/bson-maxkey-set_state-001.phpt
+++ b/tests/bson/bson-maxkey-set_state-001.phpt
@@ -9,7 +9,7 @@ echo "\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
-MongoDB\BSON\MaxKey::__set_state(array(
+--EXPECTF--
+%r\\?%rMongoDB\BSON\MaxKey::__set_state(array(
 ))
 ===DONE===
diff --git a/tests/bson/bson-minkey-clone-001.phpt b/tests/bson/bson-minkey-clone-001.phpt
index 0ec43b192..649cc2644 100644
--- a/tests/bson/bson-minkey-clone-001.phpt
+++ b/tests/bson/bson-minkey-clone-001.phpt
@@ -1,23 +1,23 @@
 --TEST--
-MongoDB\BSON\MinKey can be cloned
+MongoDB\BSON\MinKey can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $minKey = new MongoDB\BSON\MinKey;
-$minKey->foo = 'bar';
 
 $clone = clone $minKey;
 
 var_dump($clone == $minKey);
 var_dump($clone === $minKey);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 bool(true)
 bool(false)
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-minkey-clone-002.phpt b/tests/bson/bson-minkey-clone-002.phpt
new file mode 100644
index 000000000..8ec84742b
--- /dev/null
+++ b/tests/bson/bson-minkey-clone-002.phpt
@@ -0,0 +1,23 @@
+--TEST--
+MongoDB\BSON\MinKey can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$minKey = new MongoDB\BSON\MinKey;
+
+$clone = clone $minKey;
+
+var_dump($clone == $minKey);
+var_dump($clone === $minKey);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(true)
+bool(false)
+===DONE===
diff --git a/tests/bson/bson-minkey-set_state-001.phpt b/tests/bson/bson-minkey-set_state-001.phpt
index 5188703b2..17b72b2e0 100644
--- a/tests/bson/bson-minkey-set_state-001.phpt
+++ b/tests/bson/bson-minkey-set_state-001.phpt
@@ -9,7 +9,7 @@ echo "\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
-MongoDB\BSON\MinKey::__set_state(array(
+--EXPECTF--
+%r\\?%rMongoDB\BSON\MinKey::__set_state(array(
 ))
 ===DONE===
diff --git a/tests/bson/bson-objectid-clone-001.phpt b/tests/bson/bson-objectid-clone-001.phpt
index 801e0391a..9a0c8997f 100644
--- a/tests/bson/bson-objectid-clone-001.phpt
+++ b/tests/bson/bson-objectid-clone-001.phpt
@@ -1,12 +1,14 @@
 --TEST--
-MongoDB\BSON\ObjectId can be cloned
+MongoDB\BSON\ObjectId can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $objectId = new MongoDB\BSON\ObjectId("53e2a1c40640fd72175d4603");
-$objectId->foo = 'bar';
 $clone = clone $objectId;
 
 var_dump($clone == $objectId);
@@ -15,7 +17,6 @@ var_dump($clone === $objectId);
 unset($objectId);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -26,5 +27,4 @@ object(MongoDB\BSON\ObjectId)#%d (1) {
   ["oid"]=>
   string(24) "53e2a1c40640fd72175d4603"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-objectid-clone-002.phpt b/tests/bson/bson-objectid-clone-002.phpt
new file mode 100644
index 000000000..cad775a78
--- /dev/null
+++ b/tests/bson/bson-objectid-clone-002.phpt
@@ -0,0 +1,30 @@
+--TEST--
+MongoDB\BSON\ObjectId can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$objectId = new MongoDB\BSON\ObjectId("53e2a1c40640fd72175d4603");
+$clone = clone $objectId;
+
+var_dump($clone == $objectId);
+var_dump($clone === $objectId);
+
+unset($objectId);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\ObjectId)#%d (1) {
+  ["oid"]=>
+  string(24) "53e2a1c40640fd72175d4603"
+}
+===DONE===
diff --git a/tests/bson/bson-objectid-set_state-001.phpt b/tests/bson/bson-objectid-set_state-001.phpt
index 8d77ecfd0..e137d1814 100644
--- a/tests/bson/bson-objectid-set_state-001.phpt
+++ b/tests/bson/bson-objectid-set_state-001.phpt
@@ -12,7 +12,7 @@ echo "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\ObjectId::__set_state(array(
+%r\\?%rMongoDB\BSON\ObjectId::__set_state(array(
 %w'oid' => '576c25db6118fd406e6e6471',
 ))
 ===DONE===
diff --git a/tests/bson/bson-regex-clone-001.phpt b/tests/bson/bson-regex-clone-001.phpt
index dc3a7fa72..2f4ba337c 100644
--- a/tests/bson/bson-regex-clone-001.phpt
+++ b/tests/bson/bson-regex-clone-001.phpt
@@ -1,12 +1,14 @@
 --TEST--
-MongoDB\BSON\Regex can be cloned
+MongoDB\BSON\Regex can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $regexp = new MongoDB\BSON\Regex("regexp", "i");
-$regexp->foo = 'bar';
 
 $clone = clone $regexp;
 
@@ -16,7 +18,6 @@ var_dump($clone === $regexp);
 unset($regexp);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -29,5 +30,4 @@ object(MongoDB\BSON\Regex)#%d (2) {
   ["flags"]=>
   string(1) "i"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-regex-clone-002.phpt b/tests/bson/bson-regex-clone-002.phpt
new file mode 100644
index 000000000..8676247f1
--- /dev/null
+++ b/tests/bson/bson-regex-clone-002.phpt
@@ -0,0 +1,33 @@
+--TEST--
+MongoDB\BSON\Regex can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$regexp = new MongoDB\BSON\Regex("regexp", "i");
+
+$clone = clone $regexp;
+
+var_dump($clone == $regexp);
+var_dump($clone === $regexp);
+
+unset($regexp);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Regex)#%d (2) {
+  ["pattern"]=>
+  string(6) "regexp"
+  ["flags"]=>
+  string(1) "i"
+}
+===DONE===
diff --git a/tests/bson/bson-regex-set_state-001.phpt b/tests/bson/bson-regex-set_state-001.phpt
index 83555bd6f..47f92a922 100644
--- a/tests/bson/bson-regex-set_state-001.phpt
+++ b/tests/bson/bson-regex-set_state-001.phpt
@@ -13,7 +13,7 @@ echo "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Regex::__set_state(array(
+%r\\?%rMongoDB\BSON\Regex::__set_state(array(
 %w'pattern' => 'regexp',
 %w'flags' => 'i',
 ))
diff --git a/tests/bson/bson-regex-set_state-002.phpt b/tests/bson/bson-regex-set_state-002.phpt
index a99a28ea2..1233e53c6 100644
--- a/tests/bson/bson-regex-set_state-002.phpt
+++ b/tests/bson/bson-regex-set_state-002.phpt
@@ -13,7 +13,7 @@ echo "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Regex::__set_state(array(
+%r\\?%rMongoDB\BSON\Regex::__set_state(array(
 %w'pattern' => 'regexp',
 %w'flags' => 'ilmsux',
 ))
diff --git a/tests/bson/bson-symbol-clone-001.phpt b/tests/bson/bson-symbol-clone-001.phpt
index 020e0f1dd..7c3249c8e 100644
--- a/tests/bson/bson-symbol-clone-001.phpt
+++ b/tests/bson/bson-symbol-clone-001.phpt
@@ -1,5 +1,8 @@
 --TEST--
-MongoDB\BSON\Symbol can be cloned
+MongoDB\BSON\Symbol can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
@@ -8,7 +11,6 @@ require_once __DIR__ . '/../utils/basic.inc';
 $test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "test"} }'));
 
 $symbol = $test->symbol;
-$symbol->foo = 'bar';
 
 $clone = clone $symbol;
 
@@ -18,7 +20,6 @@ var_dump($clone === $symbol);
 unset($symbol);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -29,5 +30,4 @@ object(MongoDB\BSON\Symbol)#%d (1) {
   ["symbol"]=>
   string(4) "test"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-symbol-clone-002.phpt b/tests/bson/bson-symbol-clone-002.phpt
new file mode 100644
index 000000000..440453888
--- /dev/null
+++ b/tests/bson/bson-symbol-clone-002.phpt
@@ -0,0 +1,33 @@
+--TEST--
+MongoDB\BSON\Symbol can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "test"} }'));
+
+$symbol = $test->symbol;
+
+$clone = clone $symbol;
+
+var_dump($clone == $symbol);
+var_dump($clone === $symbol);
+
+unset($symbol);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Symbol)#%d (1) {
+  ["symbol"]=>
+  string(4) "test"
+}
+===DONE===
diff --git a/tests/bson/bson-timestamp-clone-001.phpt b/tests/bson/bson-timestamp-clone-001.phpt
index 10d0a9433..b790b4d4e 100644
--- a/tests/bson/bson-timestamp-clone-001.phpt
+++ b/tests/bson/bson-timestamp-clone-001.phpt
@@ -1,12 +1,14 @@
 --TEST--
-MongoDB\BSON\Timestamp can be cloned
+MongoDB\BSON\Timestamp can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $timestamp = new MongoDB\BSON\Timestamp(1234, 5678);
-$timestamp->foo = 'bar';
 
 $clone = clone $timestamp;
 
@@ -16,7 +18,6 @@ var_dump($clone === $timestamp);
 unset($timestamp);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -29,5 +30,4 @@ object(MongoDB\BSON\Timestamp)#%d (2) {
   ["timestamp"]=>
   string(4) "5678"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-timestamp-clone-002.phpt b/tests/bson/bson-timestamp-clone-002.phpt
new file mode 100644
index 000000000..23dfb883b
--- /dev/null
+++ b/tests/bson/bson-timestamp-clone-002.phpt
@@ -0,0 +1,33 @@
+--TEST--
+MongoDB\BSON\Timestamp can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$timestamp = new MongoDB\BSON\Timestamp(1234, 5678);
+
+$clone = clone $timestamp;
+
+var_dump($clone == $timestamp);
+var_dump($clone === $timestamp);
+
+unset($timestamp);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\Timestamp)#%d (2) {
+  ["increment"]=>
+  string(4) "1234"
+  ["timestamp"]=>
+  string(4) "5678"
+}
+===DONE===
diff --git a/tests/bson/bson-timestamp-set_state-001.phpt b/tests/bson/bson-timestamp-set_state-001.phpt
index e1dd4ce46..64de42600 100644
--- a/tests/bson/bson-timestamp-set_state-001.phpt
+++ b/tests/bson/bson-timestamp-set_state-001.phpt
@@ -23,17 +23,17 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Timestamp::__set_state(array(
+%r\\?%rMongoDB\BSON\Timestamp::__set_state(array(
 %w'increment' => '1234',
 %w'timestamp' => '5678',
 ))
 
-MongoDB\BSON\Timestamp::__set_state(array(
+%r\\?%rMongoDB\BSON\Timestamp::__set_state(array(
 %w'increment' => '2147483647',
 %w'timestamp' => '0',
 ))
 
-MongoDB\BSON\Timestamp::__set_state(array(
+%r\\?%rMongoDB\BSON\Timestamp::__set_state(array(
 %w'increment' => '0',
 %w'timestamp' => '2147483647',
 ))
diff --git a/tests/bson/bson-timestamp-set_state-002.phpt b/tests/bson/bson-timestamp-set_state-002.phpt
index 9a5b817c7..1439ab0fb 100644
--- a/tests/bson/bson-timestamp-set_state-002.phpt
+++ b/tests/bson/bson-timestamp-set_state-002.phpt
@@ -24,12 +24,12 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\Timestamp::__set_state(array(
+%r\\?%rMongoDB\BSON\Timestamp::__set_state(array(
 %w'increment' => '4294967295',
 %w'timestamp' => '0',
 ))
 
-MongoDB\BSON\Timestamp::__set_state(array(
+%r\\?%rMongoDB\BSON\Timestamp::__set_state(array(
 %w'increment' => '0',
 %w'timestamp' => '4294967295',
 ))
diff --git a/tests/bson/bson-toPHP-003.phpt b/tests/bson/bson-toPHP-003.phpt
index 4e5e90a66..c43102fb0 100644
--- a/tests/bson/bson-toPHP-003.phpt
+++ b/tests/bson/bson-toPHP-003.phpt
@@ -9,6 +9,7 @@ class MyClass
 {
 }
 
+#[\AllowDynamicProperties]
 class YourClass implements MongoDB\BSON\Unserializable
 {
     public function bsonUnserialize(array $data): void
@@ -20,6 +21,7 @@ class YourClass implements MongoDB\BSON\Unserializable
     }
 }
 
+#[\AllowDynamicProperties]
 class OurClass implements MongoDB\BSON\Persistable
 {
     #[\ReturnTypeWillChange]
diff --git a/tests/bson/bson-undefined-clone-001.phpt b/tests/bson/bson-undefined-clone-001.phpt
index cb3244762..9dfa2a7f1 100644
--- a/tests/bson/bson-undefined-clone-001.phpt
+++ b/tests/bson/bson-undefined-clone-001.phpt
@@ -1,5 +1,8 @@
 --TEST--
-MongoDB\BSON\Undefined can be cloned
+MongoDB\BSON\Undefined can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
@@ -8,18 +11,15 @@ require_once __DIR__ . '/../utils/basic.inc';
 $test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }'));
 
 $undefined = $test->undefined;
-$undefined->foo = 'bar';
 
 $clone = clone $undefined;
 
 var_dump($clone == $undefined);
 var_dump($clone === $undefined);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 bool(true)
 bool(false)
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-undefined-clone-002.phpt b/tests/bson/bson-undefined-clone-002.phpt
new file mode 100644
index 000000000..a1fdb8572
--- /dev/null
+++ b/tests/bson/bson-undefined-clone-002.phpt
@@ -0,0 +1,25 @@
+--TEST--
+MongoDB\BSON\Undefined can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/basic.inc';
+
+$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }'));
+
+$undefined = $test->undefined;
+
+$clone = clone $undefined;
+
+var_dump($clone == $undefined);
+var_dump($clone === $undefined);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(true)
+bool(false)
+===DONE===
diff --git a/tests/bson/bson-utcdatetime-clone-001.phpt b/tests/bson/bson-utcdatetime-clone-001.phpt
index 0b8909455..1a516c367 100644
--- a/tests/bson/bson-utcdatetime-clone-001.phpt
+++ b/tests/bson/bson-utcdatetime-clone-001.phpt
@@ -1,12 +1,14 @@
 --TEST--
-MongoDB\BSON\UTCDateTime can be cloned
+MongoDB\BSON\UTCDateTime can be cloned (PHP < 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.2'); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . "/../utils/basic.inc";
 
 $utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
-$utcdatetime->foo = 'bar';
 
 $clone = clone $utcdatetime;
 
@@ -16,7 +18,6 @@ var_dump($clone === $utcdatetime);
 unset($utcdatetime);
 
 var_dump($clone);
-var_dump($clone->foo);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -27,5 +28,4 @@ object(MongoDB\BSON\UTCDateTime)#%d (1) {
   ["milliseconds"]=>
   string(13) "1416445411987"
 }
-string(3) "bar"
 ===DONE===
diff --git a/tests/bson/bson-utcdatetime-clone-002.phpt b/tests/bson/bson-utcdatetime-clone-002.phpt
new file mode 100644
index 000000000..a7834ae59
--- /dev/null
+++ b/tests/bson/bson-utcdatetime-clone-002.phpt
@@ -0,0 +1,31 @@
+--TEST--
+MongoDB\BSON\UTCDateTime can be cloned (PHP >= 8.2)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('<', '8.2'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . "/../utils/basic.inc";
+
+$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+
+$clone = clone $utcdatetime;
+
+var_dump($clone == $utcdatetime);
+var_dump($clone === $utcdatetime);
+
+unset($utcdatetime);
+
+var_dump($clone);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+object(MongoDB\BSON\UTCDateTime)#%d (1) {
+  ["milliseconds"]=>
+  string(13) "1416445411987"
+}
+===DONE===
diff --git a/tests/bson/bson-utcdatetime-set_state-001.phpt b/tests/bson/bson-utcdatetime-set_state-001.phpt
index 60b9a01d1..688a10c9a 100644
--- a/tests/bson/bson-utcdatetime-set_state-001.phpt
+++ b/tests/bson/bson-utcdatetime-set_state-001.phpt
@@ -20,15 +20,15 @@ foreach ($tests as $milliseconds) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '0',
 ))
 
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '-1416445411987',
 ))
 
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '1416445411987',
 ))
 
diff --git a/tests/bson/bson-utcdatetime-set_state-002.phpt b/tests/bson/bson-utcdatetime-set_state-002.phpt
index 723333232..62b95b35b 100644
--- a/tests/bson/bson-utcdatetime-set_state-002.phpt
+++ b/tests/bson/bson-utcdatetime-set_state-002.phpt
@@ -22,15 +22,15 @@ foreach ($tests as $milliseconds) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '0',
 ))
 
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '-1416445411987',
 ))
 
-MongoDB\BSON\UTCDateTime::__set_state(array(
+%r\\?%rMongoDB\BSON\UTCDateTime::__set_state(array(
 %w'milliseconds' => '1416445411987',
 ))
 
diff --git a/tests/bson/bug1598-002.phpt b/tests/bson/bug1598-002.phpt
index ddce01fa5..020f8581a 100644
--- a/tests/bson/bug1598-002.phpt
+++ b/tests/bson/bug1598-002.phpt
@@ -1,5 +1,8 @@
 --TEST--
 PHPC-1598: BSON type get_gc should delegate to zend_std_get_properties
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/cursorid/cursorid-set_state-001.phpt b/tests/cursorid/cursorid-set_state-001.phpt
index f740e700f..c0b8cb169 100644
--- a/tests/cursorid/cursorid-set_state-001.phpt
+++ b/tests/cursorid/cursorid-set_state-001.phpt
@@ -12,7 +12,7 @@ echo "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\CursorId::__set_state(array(
+%r\\?%rMongoDB\Driver\CursorId::__set_state(array(
    'id' => %r(7250031947823432848|'7250031947823432848')%r,
 ))
 ===DONE===
diff --git a/tests/cursorid/cursorid-var_export-001.phpt b/tests/cursorid/cursorid-var_export-001.phpt
index 74166d334..a38a16a3b 100644
--- a/tests/cursorid/cursorid-var_export-001.phpt
+++ b/tests/cursorid/cursorid-var_export-001.phpt
@@ -13,7 +13,7 @@ echo var_export($cursorId, true), "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\CursorId::__set_state(array(
+%r\\?%rMongoDB\Driver\CursorId::__set_state(array(
    'id' => %r(7250031947823432848|'7250031947823432848')%r,
 ))
 ===DONE===
diff --git a/tests/readConcern/bug1598-002.phpt b/tests/readConcern/bug1598-002.phpt
index a343f81de..fb7450f7c 100644
--- a/tests/readConcern/bug1598-002.phpt
+++ b/tests/readConcern/bug1598-002.phpt
@@ -1,5 +1,8 @@
 --TEST--
 PHPC-1598: ReadConcern get_gc should delegate to zend_std_get_properties
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/readConcern/readconcern-set_state-001.phpt b/tests/readConcern/readconcern-set_state-001.phpt
index 78f73bdd9..fe8a62bde 100644
--- a/tests/readConcern/readconcern-set_state-001.phpt
+++ b/tests/readConcern/readconcern-set_state-001.phpt
@@ -27,27 +27,27 @@ echo "\n\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 %w'level' => 'available',
 ))
 
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 %w'level' => 'linearizable',
 ))
 
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 %w'level' => 'local',
 ))
 
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 %w'level' => 'majority',
 ))
 
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 %w'level' => 'snapshot',
 ))
 
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 ))
 
 ===DONE===
diff --git a/tests/readConcern/readconcern-var_export-001.phpt b/tests/readConcern/readconcern-var_export-001.phpt
index 73fe09e77..89991838d 100644
--- a/tests/readConcern/readconcern-var_export-001.phpt
+++ b/tests/readConcern/readconcern-var_export-001.phpt
@@ -21,22 +21,22 @@ foreach ($tests as $test) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
-MongoDB\Driver\ReadConcern::__set_state(array(
+--EXPECTF--
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
 ))
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
    'level' => 'linearizable',
 ))
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
    'level' => 'local',
 ))
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
    'level' => 'majority',
 ))
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
    'level' => 'available',
 ))
-MongoDB\Driver\ReadConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadConcern::__set_state(array(
    'level' => 'snapshot',
 ))
 ===DONE===
diff --git a/tests/readPreference/bug1598-002.phpt b/tests/readPreference/bug1598-002.phpt
index 2a57b8de4..5bc5655ba 100644
--- a/tests/readPreference/bug1598-002.phpt
+++ b/tests/readPreference/bug1598-002.phpt
@@ -1,5 +1,8 @@
 --TEST--
 PHPC-1598: ReadPreference get_gc should delegate to zend_std_get_properties
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/readPreference/readpreference-set_state-001.phpt b/tests/readPreference/readpreference-set_state-001.phpt
index 08ef3f88e..b8b957684 100644
--- a/tests/readPreference/readpreference-set_state-001.phpt
+++ b/tests/readPreference/readpreference-set_state-001.phpt
@@ -26,27 +26,27 @@ foreach ($tests as $fields) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primary',
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primaryPreferred',
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondaryPreferred',
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'nearest',
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'tags' => 
   array (
@@ -57,7 +57,7 @@ MongoDB\Driver\ReadPreference::__set_state(array(
   ),
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'tags' => 
   array (
@@ -76,7 +76,7 @@ MongoDB\Driver\ReadPreference::__set_state(array(
   ),
 ))
 
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'maxStalenessSeconds' => 1000,
 ))
diff --git a/tests/readPreference/readpreference-var_export-001.phpt b/tests/readPreference/readpreference-var_export-001.phpt
index c52d32ce9..4ee9be0b1 100644
--- a/tests/readPreference/readpreference-var_export-001.phpt
+++ b/tests/readPreference/readpreference-var_export-001.phpt
@@ -25,25 +25,25 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primary',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primaryPreferred',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondaryPreferred',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'nearest',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primary',
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'tags' => 
   array (
@@ -53,7 +53,7 @@ MongoDB\Driver\ReadPreference::__set_state(array(
     %S),
   ),
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'tags' => 
   array (
@@ -71,7 +71,7 @@ MongoDB\Driver\ReadPreference::__set_state(array(
     %S),
   ),
 ))
-MongoDB\Driver\ReadPreference::__set_state(array(
+%r\\?%rMongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'maxStalenessSeconds' => 1000,
 ))
diff --git a/tests/serverApi/serverApi-set_state-001.phpt b/tests/serverApi/serverApi-set_state-001.phpt
index c1e43fb58..b1bf54e0b 100644
--- a/tests/serverApi/serverApi-set_state-001.phpt
+++ b/tests/serverApi/serverApi-set_state-001.phpt
@@ -22,31 +22,31 @@ foreach ($tests as $fields) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => NULL,
    'deprecationErrors' => NULL,
 ))
 
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => true,
    'deprecationErrors' => NULL,
 ))
 
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => NULL,
    'deprecationErrors' => true,
 ))
 
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => false,
    'deprecationErrors' => false,
 ))
 
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => NULL,
    'deprecationErrors' => NULL,
diff --git a/tests/serverApi/serverApi-var_export-001.phpt b/tests/serverApi/serverApi-var_export-001.phpt
index aba57fb0d..8f1e84669 100644
--- a/tests/serverApi/serverApi-var_export-001.phpt
+++ b/tests/serverApi/serverApi-var_export-001.phpt
@@ -20,22 +20,22 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => NULL,
    'deprecationErrors' => NULL,
 ))
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => true,
    'deprecationErrors' => NULL,
 ))
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => NULL,
    'deprecationErrors' => true,
 ))
-MongoDB\Driver\ServerApi::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerApi::__set_state(array(
    'version' => '1',
    'strict' => false,
    'deprecationErrors' => false,
diff --git a/tests/serverDescription/serverDescription-var_export-001.phpt b/tests/serverDescription/serverDescription-var_export-001.phpt
index 3ce79b89d..9b21f0242 100644
--- a/tests/serverDescription/serverDescription-var_export-001.phpt
+++ b/tests/serverDescription/serverDescription-var_export-001.phpt
@@ -17,7 +17,7 @@ echo var_export($server->getServerDescription(), true), "\n";
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\ServerDescription::__set_state(array(
+%r\\?%rMongoDB\Driver\ServerDescription::__set_state(array(
    'host' => '%s',
    'port' => %d,
    'type' => '%r(Standalone|Mongos|RSPrimary|LoadBalancer)%r',
diff --git a/tests/session/session-startTransaction_error-005.phpt b/tests/session/session-startTransaction_error-005.phpt
index 8e5556857..d3c166495 100644
--- a/tests/session/session-startTransaction_error-005.phpt
+++ b/tests/session/session-startTransaction_error-005.phpt
@@ -30,7 +30,7 @@ foreach ($options as $txnOptions) {
 <?php exit(0); ?>
 --EXPECTF--
 OK: Got TypeError
-%SMongoDB\Driver\Session::startTransaction()%sarray, int given
+%r\\?%rMongoDB\Driver\Session::startTransaction()%sarray, int given
 OK: Got TypeError
-%SMongoDB\Driver\Session::startTransaction()%sarray, %r(object|stdClass)%r given
+%r\\?%rMongoDB\Driver\Session::startTransaction()%sarray, %r(object|stdClass)%r given
 ===DONE===
diff --git a/tests/standalone/bug0545.phpt b/tests/standalone/bug0545.phpt
index c085c3e3b..fef846365 100644
--- a/tests/standalone/bug0545.phpt
+++ b/tests/standalone/bug0545.phpt
@@ -8,6 +8,7 @@ PHPC-545: Update does not serialize embedded Persistable's __pclass field
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+#[\AllowDynamicProperties]
 class Book implements MongoDB\BSON\Persistable
 {
     #[\ReturnTypeWillChange]
@@ -25,6 +26,7 @@ class Book implements MongoDB\BSON\Persistable
     }
 }
 
+#[\AllowDynamicProperties]
 class Page implements MongoDB\BSON\Persistable
 {
     #[\ReturnTypeWillChange]
diff --git a/tests/writeConcern/bug1598-002.phpt b/tests/writeConcern/bug1598-002.phpt
index 686392c96..e9ea1e846 100644
--- a/tests/writeConcern/bug1598-002.phpt
+++ b/tests/writeConcern/bug1598-002.phpt
@@ -1,5 +1,8 @@
 --TEST--
 PHPC-1598: WriteConcern get_gc should delegate to zend_std_get_properties
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/writeConcern/writeconcern-set_state-001.phpt b/tests/writeConcern/writeconcern-set_state-001.phpt
index cb701ae48..4dd0a71b0 100644
--- a/tests/writeConcern/writeconcern-set_state-001.phpt
+++ b/tests/writeConcern/writeconcern-set_state-001.phpt
@@ -29,58 +29,58 @@ foreach ($tests as $fields) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'majority',
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => -1,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 0,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'majority',
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'tag',
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'j' => false,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'wtimeout' => 1000,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'j' => true,
    'wtimeout' => 1000,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'j' => true,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'wtimeout' => 1000,
 ))
 
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'wtimeout' => %r2147483648|'2147483648'%r,
 ))
 
diff --git a/tests/writeConcern/writeconcern-var_export-001.phpt b/tests/writeConcern/writeconcern-var_export-001.phpt
index 25bc1fdd8..7460a0889 100644
--- a/tests/writeConcern/writeconcern-var_export-001.phpt
+++ b/tests/writeConcern/writeconcern-var_export-001.phpt
@@ -30,49 +30,49 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'majority',
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => -1,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 0,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'majority',
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 'tag',
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'j' => false,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'wtimeout' => 1000,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 1,
    'j' => true,
    'wtimeout' => 1000,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'j' => true,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'wtimeout' => 1000,
 ))
-MongoDB\Driver\WriteConcern::__set_state(array(
+%r\\?%rMongoDB\Driver\WriteConcern::__set_state(array(
    'w' => 2,
    'wtimeout' => %r2147483648|'2147483648'%r,
 ))