diff -pruN 2.0.4-3/debian/changelog 2.0.4-3ubuntu1/debian/changelog
--- 2.0.4-3/debian/changelog	2016-06-08 18:27:40.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/changelog	2018-02-21 21:20:04.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-xml-element (2.0.4-3ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:20:04 -0800
+
 php-horde-xml-element (2.0.4-3) unstable; urgency=medium
 
   * Update Standards-Version to 3.9.8, no change
diff -pruN 2.0.4-3/debian/control 2.0.4-3ubuntu1/debian/control
--- 2.0.4-3/debian/control	2016-06-08 18:27:40.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/control	2018-02-21 21:20:04.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-xml-element
 Section: php
 Priority: extra
-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu@debian.org>
 Build-Depends: debhelper (>= 9), pkg-php-tools, pear-horde-channel
 Standards-Version: 3.9.8
diff -pruN 2.0.4-3/debian/patches/phpunit6_compat.patch 2.0.4-3ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.0.4-3/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:20:01.000000000 +0000
@@ -0,0 +1,38 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-21
+
+--- php-horde-xml-element-2.0.4.orig/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/CountTest.php
++++ php-horde-xml-element-2.0.4/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/CountTest.php
+@@ -6,7 +6,7 @@
+  * @package    Xml_Element
+  * @subpackage UnitTests
+  */
+-class Horde_Xml_Element_CountTest extends PHPUnit_Framework_TestCase
++class Horde_Xml_Element_CountTest extends PHPUnit\Framework\TestCase
+ {
+     public function testCount()
+     {
+--- php-horde-xml-element-2.0.4.orig/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/ElementTest.php
++++ php-horde-xml-element-2.0.4/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/ElementTest.php
+@@ -14,7 +14,7 @@
+  * @package    Xml_Element
+  * @subpackage UnitTests
+  */
+-class Horde_Xml_Element_ElementTest extends PHPUnit_Framework_TestCase
++class Horde_Xml_Element_ElementTest extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
+--- php-horde-xml-element-2.0.4.orig/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/IteratorTest.php
++++ php-horde-xml-element-2.0.4/Horde_Xml_Element-2.0.4/test/Horde/Xml/Element/IteratorTest.php
+@@ -6,7 +6,7 @@
+  * @package    Xml_Element
+  * @subpackage UnitTests
+  */
+-class Horde_Xml_Element_IteratorTest extends PHPUnit_Framework_TestCase
++class Horde_Xml_Element_IteratorTest extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
diff -pruN 2.0.4-3/debian/patches/series 2.0.4-3ubuntu1/debian/patches/series
--- 2.0.4-3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/patches/series	2018-02-21 21:19:42.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch