diff -pruN 2.0.8-1/debian/changelog 2.0.8-1ubuntu1/debian/changelog
--- 2.0.8-1/debian/changelog	2017-09-27 21:26:19.000000000 +0000
+++ 2.0.8-1ubuntu1/debian/changelog	2018-02-22 22:21:02.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-wicked (2.0.8-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 22 Feb 2018 14:21:02 -0800
+
 php-horde-wicked (2.0.8-1) unstable; urgency=medium
 
   * New upstream version 2.0.8
diff -pruN 2.0.8-1/debian/control 2.0.8-1ubuntu1/debian/control
--- 2.0.8-1/debian/control	2017-09-27 21:26:19.000000000 +0000
+++ 2.0.8-1ubuntu1/debian/control	2018-02-22 22:21:02.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-wicked
 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 2.0.8-1/debian/patches/phpunit6_compat.patch 2.0.8-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.0.8-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.8-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-22 22:20:59.000000000 +0000
@@ -0,0 +1,126 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-22
+
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_BugTests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_BugTests.php
+@@ -5,7 +5,7 @@ require_once 'Text/Wiki.php';
+ require_once 'Text/Wiki/Parse/Default/List.php';
+ 
+ // class to test the Text_Wiki::transform() with different wiki markups
+-class Text_Wiki_BugTests extends PHPUnit_Framework_TestCase
++class Text_Wiki_BugTests extends PHPUnit\Framework\TestCase
+ {
+     protected $wiki;
+ 
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Generic_Transform_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Generic_Transform_Tests.php
+@@ -4,7 +4,7 @@ require_once 'PHPUnit/Framework/TestCase
+ require_once 'Text/Wiki.php';
+ 
+ // class to test the Text_Wiki::transform() with different wiki markups
+-class Text_Wiki_Generic_Transform_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Generic_Transform_Tests extends PHPUnit\Framework\TestCase
+ {
+ 
+     public function testTransformFromMediawikiToTiki()
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Parse_Mediawiki_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Parse_Mediawiki_Tests.php
+@@ -53,7 +53,7 @@ class Text_Wiki_Parse_Mediawiki_AllTests
+     
+ }
+ 
+-class Text_Wiki_Parse_Mediawiki_SetUp_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Parse_Mediawiki_SetUp_Tests extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+@@ -155,13 +155,13 @@ class Text_Wiki_Parse_Mediawiki_Deflist_
+ }
+ 
+ 
+-class Text_Wiki_Parse_Mediawiki_Emphasis_Test extends PHPUnit_Framework_TestCase 
++class Text_Wiki_Parse_Mediawiki_Emphasis_Test extends PHPUnit\Framework\TestCase 
+ {
+ 
+     public function testMediawikiParseEmphasisParse()
+     {
+-        $obj = $this->getMock('Text_Wiki_Parse_Emphasis', array('process'), array(), 'Text_Wiki_Parse_Emphasis_Parse_Mock', false);
+-        $obj->wiki = $this->getMock('Text_Wiki');
++        $obj = $this->createMock('Text_Wiki_Parse_Emphasis', array('process'), array(), 'Text_Wiki_Parse_Emphasis_Parse_Mock', false);
++        $obj->wiki = $this->createMock('Text_Wiki');
+         $obj->wiki->source = file_get_contents(dirname(__FILE__) . '/fixtures/mediawiki_syntax.txt');
+ 
+         $lines = explode("\n", $obj->wiki->source);
+@@ -686,7 +686,7 @@ class Text_Wiki_Parse_Mediawiki_Wikilink
+     
+ }
+ 
+-class Text_Wiki_Parse_Mediawiki_Url_Test extends PHPUnit_Framework_TestCase
++class Text_Wiki_Parse_Mediawiki_Url_Test extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+@@ -717,7 +717,7 @@ class Text_Wiki_Parse_Mediawiki_Url_Test
+     {
+         // NOT WORKING: unable to mock the class Text_Wiki_Parse_Url using its constructor
+         $textWiki = Text_Wiki::factory('Mediawiki');
+-        $obj = $this->getMock('Text_Wiki_Parse_Url',
++        $obj = $this->createMock('Text_Wiki_Parse_Url',
+             array('process', 'processWithoutProtocol', 'processInlineEmail', 'processFootnote', 'processOrdinary', 'processDescr'),
+             array($textWiki),
+         );
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Parse_Tiki_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Parse_Tiki_Tests.php
+@@ -59,7 +59,7 @@ class Text_Wiki_Parse_Tiki_AllTests exte
+ 
+ }
+ 
+-class Text_Wiki_Parse_Tiki_SetUp_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Parse_Tiki_SetUp_Tests extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Render_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Render_Tests.php
+@@ -6,7 +6,7 @@ require_once 'Text/Wiki/Render.php';
+ require_once 'Text/Wiki/Render/Xhtml.php';
+ require_once 'Text/Wiki/Render/Xhtml/Address.php';
+ 
+-class Text_Wiki_Render_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Render_Tests extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Render_Tiki_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Render_Tiki_Tests.php
+@@ -97,7 +97,7 @@ class Text_Wiki_Render_Tiki_AllTests ext
+     
+ }
+ 
+-class Text_Wiki_Render_Tiki_Test extends PHPUnit_Framework_TestCase
++class Text_Wiki_Render_Tiki_Test extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+@@ -118,7 +118,7 @@ class Text_Wiki_Render_Tiki_Test extends
+ 
+ }
+ 
+-class Text_Wiki_Render_Tiki_SetUp_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Render_Tiki_SetUp_Tests extends PHPUnit\Framework\TestCase
+ {
+ 
+     protected function setUp()
+--- php-horde-wicked-2.0.8.orig/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Tests.php
++++ php-horde-wicked-2.0.8/wicked-2.0.8/lib/Text_Wiki/tests/Text_Wiki_Tests.php
+@@ -4,7 +4,7 @@ require_once 'PEAR.php';
+ require_once 'PHPUnit/Framework/TestCase.php';
+ require_once 'Text/Wiki.php';
+ 
+-class Text_Wiki_Tests extends PHPUnit_Framework_TestCase
++class Text_Wiki_Tests extends PHPUnit\Framework\TestCase
+ {
+     protected function setUp()
+     {
diff -pruN 2.0.8-1/debian/patches/series 2.0.8-1ubuntu1/debian/patches/series
--- 2.0.8-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.8-1ubuntu1/debian/patches/series	2018-02-22 22:20:42.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch