diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff7d42b4..a15ee630 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,8 @@ jobs:
   ubuntu:
     strategy:
       matrix:
-          version: ['8.1', '8.2', '8.3', '8.4']
+          version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+    continue-on-error: ${{ matrix.version == '8.5' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PhD
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f04f7f0..c964cbb5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,8 @@ jobs:
     name: test
     strategy:
       matrix:
-        version: ['8.1', '8.2', '8.3', '8.4']
+        version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+    continue-on-error: ${{ matrix.version == '8.5' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PhD
diff --git a/phpdotnet/phd/Reader/Partial.php b/phpdotnet/phd/Reader/Partial.php
index 6ff1d631..84b341db 100644
--- a/phpdotnet/phd/Reader/Partial.php
+++ b/phpdotnet/phd/Reader/Partial.php
@@ -31,7 +31,7 @@ public function read(): bool {
         static $arraySkip = array();
 
         while($ret = parent::read()) {
-            $id = $this->getAttributeNs("id", self::XMLNS_XML);
+            $id = $this->getAttributeNs("id", self::XMLNS_XML) ?? '';
             $currentPartial = end($arrayPartial);
             $currentSkip = end($arraySkip);
             if (isset($this->partial[$id])) {
diff --git a/phpdotnet/phd/TestRender.php b/phpdotnet/phd/TestRender.php
index a0f82f21..95cc79e9 100644
--- a/phpdotnet/phd/TestRender.php
+++ b/phpdotnet/phd/TestRender.php
@@ -17,7 +17,7 @@ public function run() {
             $this->attach($this->index);
             $this->reader->open($this->config->xmlFile);
             $this->execute($this->reader);
-            $this->detach($this->index);
+            $this->offsetUnset($this->index);
         }
 
         if ($this->format !== null) {
diff --git a/tests/bug_doc-en_GH-3353.phpt b/tests/bug_doc-en_GH-3353.phpt
index e2f0b0c3..b32584fb 100644
--- a/tests/bug_doc-en_GH-3353.phpt
+++ b/tests/bug_doc-en_GH-3353.phpt
@@ -26,7 +26,7 @@ $reader = new Reader($outputHandler);
 $reader->open($config->xmlFile, null, LIBXML_PARSEHUGE | LIBXML_XINCLUDE);
 $render->execute($reader);
 
-$render->detach($index);
+$render->offsetUnset($index);
 
 
 // Rendering