diff -pruN 2.5.4-1/debian/changelog 2.5.4-1ubuntu1/debian/changelog
--- 2.5.4-1/debian/changelog	2017-07-01 20:52:47.000000000 +0000
+++ 2.5.4-1ubuntu1/debian/changelog	2018-02-20 23:04:50.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-service-weather (2.5.4-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespace
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 20 Feb 2018 15:04:50 -0800
+
 php-horde-service-weather (2.5.4-1) unstable; urgency=medium
 
   * New upstream version 2.5.4
diff -pruN 2.5.4-1/debian/control 2.5.4-1ubuntu1/debian/control
--- 2.5.4-1/debian/control	2017-07-01 20:52:47.000000000 +0000
+++ 2.5.4-1ubuntu1/debian/control	2018-02-20 23:04:50.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-service-weather
 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.5.4-1/debian/patches/phpunit6_compat.patch 2.5.4-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.5.4-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.4-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-20 23:04:50.000000000 +0000
@@ -0,0 +1,50 @@
+Description: PHPUnit 6 has namespace classes
+ Also setExpectedExpectation -> expecteExpectation.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-20
+
+--- a/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/WundergroundTest.php
++++ b/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/WundergroundTest.php
+@@ -11,7 +11,7 @@
+  * @license    http://www.horde.org/licenses/bsd BSD
+  * @link       http://pear.horde.org/index.php?package=Service_Weather
+  */
+-class Horde_Service_Weather_WundergroundTest extends PHPUnit_Framework_TestCase
++class Horde_Service_Weather_WundergroundTest extends PHPUnit\Framework\TestCase
+ {
+     public function testCurrentConditions()
+     {
+--- a/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/MetarTest.php
++++ b/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/MetarTest.php
+@@ -90,7 +90,7 @@
+         $this->assertEquals('Visibility AT 3 miles mist Sky overcast', $dayTwo->conditions);
+ 
+         // Test unknown throws exception
+-        $this->setExpectedException('Horde_Service_Weather_Exception_InvalidProperty');
++        $this->expectException('Horde_Service_Weather_Exception_InvalidProperty');
+         $this->assertEquals(false, $dayOne->foobar);
+     }
+ 
+--- a/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/WwoTest.php
++++ b/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/WwoTest.php
+@@ -107,7 +107,7 @@
+         $this->assertEquals(false, $dayOne->snow_total);
+ 
+         // Test unknown throws exception
+-        $this->setExpectedException('Horde_Service_Weather_Exception_InvalidProperty');
++        $this->expectException('Horde_Service_Weather_Exception_InvalidProperty');
+         $this->assertEquals(false, $dayOne->foobar);
+     }
+ 
+--- a/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/Wwov2Test.php
++++ b/Horde_Service_Weather-2.5.4/test/Horde/Service/Weather/Wwov2Test.php
+@@ -92,7 +92,7 @@
+         $this->assertEquals(11, $dayOne->wind_speed);
+ 
+         // Test unknown throws exception
+-        $this->setExpectedException('Horde_Service_Weather_Exception_InvalidProperty');
++        $this->expectException('Horde_Service_Weather_Exception_InvalidProperty');
+         $this->assertEquals(false, $dayOne->foobar);
+     }
+ 
diff -pruN 2.5.4-1/debian/patches/series 2.5.4-1ubuntu1/debian/patches/series
--- 2.5.4-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.4-1ubuntu1/debian/patches/series	2018-02-20 23:04:25.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch