diff -pruN 5.0.7-1/debian/changelog 5.0.7-1ubuntu1/debian/changelog
--- 5.0.7-1/debian/changelog	2017-09-27 21:10:49.000000000 +0000
+++ 5.0.7-1ubuntu1/debian/changelog	2018-02-21 21:34:13.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-passwd (5.0.7-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:34:13 -0800
+
 php-horde-passwd (5.0.7-1) unstable; urgency=medium
 
   * New upstream version 5.0.7
diff -pruN 5.0.7-1/debian/control 5.0.7-1ubuntu1/debian/control
--- 5.0.7-1/debian/control	2017-09-27 21:10:49.000000000 +0000
+++ 5.0.7-1ubuntu1/debian/control	2018-02-21 21:34:13.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-passwd
 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, php-horde-role
 Standards-Version: 3.9.8
diff -pruN 5.0.7-1/debian/patches/phpunit6_compat.patch 5.0.7-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 5.0.7-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 5.0.7-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:33:48.000000000 +0000
@@ -0,0 +1,16 @@
+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-passwd-5.0.7.orig/passwd-5.0.7/test/Passwd/TestCase.php
++++ php-horde-passwd-5.0.7/passwd-5.0.7/test/Passwd/TestCase.php
+@@ -8,7 +8,7 @@
+  * @package    Passwd
+  * @subpackage UnitTests
+  */
+-class Passwd_TestCase extends PHPUnit_Framework_TestCase
++class Passwd_TestCase extends PHPUnit\Framework\TestCase
+ {
+     protected function getInjector()
+     {
diff -pruN 5.0.7-1/debian/patches/series 5.0.7-1ubuntu1/debian/patches/series
--- 5.0.7-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 5.0.7-1ubuntu1/debian/patches/series	2018-02-21 21:33:56.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch