diff -pruN 3.2.16-1/debian/changelog 3.2.16-1ubuntu1/debian/changelog
--- 3.2.16-1/debian/changelog	2017-09-27 19:21:10.000000000 +0000
+++ 3.2.16-1ubuntu1/debian/changelog	2018-02-16 23:39:07.000000000 +0000
@@ -1,3 +1,9 @@
+php-horde-ingo (3.2.16-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 compatibility.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 16 Feb 2018 15:39:07 -0800
+
 php-horde-ingo (3.2.16-1) unstable; urgency=medium
 
   * New upstream version 3.2.16
diff -pruN 3.2.16-1/debian/control 3.2.16-1ubuntu1/debian/control
--- 3.2.16-1/debian/control	2017-09-27 19:21:10.000000000 +0000
+++ 3.2.16-1ubuntu1/debian/control	2018-02-16 23:39:07.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-ingo
 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 3.2.16-1/debian/patches/phpunit6_compat.patch 3.2.16-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 3.2.16-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.2.16-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-16 23:39:04.000000000 +0000
@@ -0,0 +1,73 @@
+Description: PHPUnit 6 compatibility
+ Namespaced classes and getMock() -> createMock()
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-16
+
+--- php-horde-ingo-3.2.16.orig/ingo-3.2.16/test/Ingo/Unit/TestBase.php
++++ php-horde-ingo-3.2.16/ingo-3.2.16/test/Ingo/Unit/TestBase.php
+@@ -25,32 +25,32 @@
+  * @subpackage UnitTests
+  */
+ 
+-class Ingo_Unit_TestBase extends PHPUnit_Framework_TestCase
++class Ingo_Unit_TestBase extends PHPUnit\Framework\TestCase
+ {
+     protected $script;
+     protected $storage;
+ 
+     public function setUp()
+     {
+-        $injector = $this->getMock('Horde_Injector', array(), array(), '', false);
++        $injector = $this->createMock('Horde_Injector', array(), array(), '', false);
+         $injector->expects($this->any())
+             ->method('getInstance')
+             ->will($this->returnCallback(array($this, '_injectorGetInstance')));
+         $GLOBALS['injector'] = $injector;
+ 
+-        $prefs = $this->getMock('Horde_Prefs', array(), array(), '', false);
++        $prefs = $this->createMock('Horde_Prefs', array(), array(), '', false);
+         $prefs->expects($this->any())
+             ->method('getValue')
+             ->will($this->returnValue(false));
+         $GLOBALS['prefs'] = $prefs;
+ 
+-        $registry = $this->getMock('Horde_Registry', array(), array(), '', false);
++        $registry = $this->createMock('Horde_Registry', array(), array(), '', false);
+         $registry->expects($this->any())
+             ->method('hasMethod')
+             ->will($this->returnValue(true));
+         $GLOBALS['registry'] = $registry;
+ 
+-        $GLOBALS['session'] = $this->getMock('Horde_Session');
++        $GLOBALS['session'] = $this->createMock('Horde_Session');
+ 
+         if (!defined('INGO_BASE')) {
+             define('INGO_BASE', realpath(__DIR__ . '/../../..'));
+@@ -72,7 +72,7 @@ class Ingo_Unit_TestBase extends PHPUnit
+     {
+         switch ($interface) {
+         case 'Horde_Core_Factory_Identity':
+-            $identity = $this->getMock('Horde_Core_Prefs_Identity', array(), array(), '', false);
++            $identity = $this->createMock('Horde_Core_Prefs_Identity', array(), array(), '', false);
+             $identity->expects($this->any())
+                 ->method('getName')
+                 ->will($this->returnValue('Foo'));
+@@ -83,7 +83,7 @@ class Ingo_Unit_TestBase extends PHPUnit
+                 ->method('getValue')
+                 ->will($this->returnValue('XYZ'));
+ 
+-            $factory = $this->getMock($interface, array(), array(), '', false);
++            $factory = $this->createMock($interface, array(), array(), '', false);
+             $factory->expects($this->any())
+                 ->method('create')
+                 ->will($this->returnValue($identity));
+@@ -91,7 +91,7 @@ class Ingo_Unit_TestBase extends PHPUnit
+             return $factory;
+ 
+         case 'Horde_Core_Perms':
+-            $perms = $this->getMock('Horde_Core_Perms', array(), array(), '', false);
++            $perms = $this->createMock('Horde_Core_Perms', array(), array(), '', false);
+             $perms->method('hasAppPermission')->will($this->returnValue(true));
+             return $perms;
+         }
diff -pruN 3.2.16-1/debian/patches/series 3.2.16-1ubuntu1/debian/patches/series
--- 3.2.16-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 3.2.16-1ubuntu1/debian/patches/series	2018-02-16 23:38:32.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch