diff -pruN 2.9.0-1/debian/changelog 2.9.0-1ubuntu1/debian/changelog
--- 2.9.0-1/debian/changelog	2017-12-16 15:07:53.000000000 +0000
+++ 2.9.0-1ubuntu1/debian/changelog	2018-02-21 21:29:26.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-prefs (2.9.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes .
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:29:26 -0800
+
 php-horde-prefs (2.9.0-1) unstable; urgency=medium
 
   * New upstream version 2.9.0
diff -pruN 2.9.0-1/debian/control 2.9.0-1ubuntu1/debian/control
--- 2.9.0-1/debian/control	2017-12-16 15:07:53.000000000 +0000
+++ 2.9.0-1ubuntu1/debian/control	2018-02-21 21:29:26.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-prefs
 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.9.0-1/debian/patches/phpunit6_compat.patch 2.9.0-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.9.0-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.9.0-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:29:22.000000000 +0000
@@ -0,0 +1,47 @@
+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-prefs-2.9.0.orig/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/IdentityTest.php
++++ php-horde-prefs-2.9.0/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/IdentityTest.php
+@@ -23,7 +23,7 @@
+  * @link      http://pear.horde.org/index.php?package=Prefs
+  * @package   Prefs
+  */
+-class Horde_Prefs_Unit_IdentityTest extends PHPUnit_Framework_TestCase
++class Horde_Prefs_Unit_IdentityTest extends PHPUnit\Framework\TestCase
+ {
+     private $identity;
+ 
+--- php-horde-prefs-2.9.0.orig/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/Storage/FileTest.php
++++ php-horde-prefs-2.9.0/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/Storage/FileTest.php
+@@ -25,7 +25,7 @@
+  * @license  http://www.horde.org/licenses/lgpl21 LGPL 2.1
+  * @link     http://pear.horde.org/index.php?package=Prefs
+  */
+-class Horde_Prefs_Unit_Storage_FileTest extends PHPUnit_Framework_TestCase
++class Horde_Prefs_Unit_Storage_FileTest extends PHPUnit\Framework\TestCase
+ {
+     /**
+      * @expectedException InvalidArgumentException
+--- php-horde-prefs-2.9.0.orig/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/Storage/KolabImapTest.php
++++ php-horde-prefs-2.9.0/Horde_Prefs-2.9.0/test/Horde/Prefs/Unit/Storage/KolabImapTest.php
+@@ -21,7 +21,7 @@
+  * @license  http://www.horde.org/licenses/lgpl21 LGPL 2.1
+  * @link     http://pear.horde.org/index.php?package=Prefs
+  */
+-class Horde_Prefs_Unit_Storage_KolabImapTest extends PHPUnit_Framework_TestCase
++class Horde_Prefs_Unit_Storage_KolabImapTest extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
+@@ -163,7 +163,7 @@ class Horde_Prefs_Unit_Storage_KolabImap
+                     'data' => array('queryset' => 'horde'),
+                 ),
+                 'cache'  => new Horde_Cache(new Horde_Cache_Storage_Mock()),
+-                'logger' => $this->getMock('Horde_Log_Logger'),
++                'logger' => $this->createMock('Horde_Log_Logger'),
+             )
+         );
+         return $factory->create();
diff -pruN 2.9.0-1/debian/patches/series 2.9.0-1ubuntu1/debian/patches/series
--- 2.9.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.9.0-1ubuntu1/debian/patches/series	2018-02-21 21:29:00.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch