diff -Nru golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/changelog golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/changelog
--- golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/changelog	2018-02-06 05:21:50.000000000 +0000
+++ golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/changelog	2018-04-13 15:47:48.000000000 +0000
@@ -1,3 +1,10 @@
+golang-github-juju-testing (0.0~git20170608.2fe0e88-3ubuntu1) bionic; urgency=medium
+
+  * d/p/mongodb-3.6: cherry-pick fixes needed for MongoDB 3.6 to fix
+    dep8 failure.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Fri, 13 Apr 2018 16:40:29 +0100
+
 golang-github-juju-testing (0.0~git20170608.2fe0e88-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/control golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/control
--- golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/control	2018-02-06 05:21:50.000000000 +0000
+++ golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/control	2018-04-13 15:41:51.000000000 +0000
@@ -1,7 +1,8 @@
 Source: golang-github-juju-testing
 Section: devel
 Priority: optional
-Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Alexandre Viau <aviau@debian.org>
 Build-Depends: debhelper (>= 10),
                dh-golang,
diff -Nru golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/mongodb-3.6 golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/mongodb-3.6
--- golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/mongodb-3.6	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/mongodb-3.6	2018-04-13 15:47:11.000000000 +0000
@@ -0,0 +1,39 @@
+From 1f2396685494ccf2c5079936561a70652ef78111 Mon Sep 17 00:00:00 2001
+From: John Arbash Meinel <john@arbash-meinel.com>
+Date: Mon, 2 Apr 2018 15:18:23 +0400
+Subject: [PATCH] Changes to support Mongo 3.6.
+
+Don't drop the 'admin' database, and we don't actually need to pass
+`--nohttpinterface`.
+
+In 3.6, there is no '--httpinterface' that you could pass, so there is
+also not its negation. But since it isn't the default, we don't actually
+ever need to pass it.
+
+Origin: upstream, https://github.com/juju/testing/commit/1f2396685494ccf2c5079936561a70652ef78111
+Last-Update: 2018-04-13
+---
+ mgo.go | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/mgo.go b/mgo.go
+index c128747..de668ca 100644
+--- a/mgo.go
++++ b/mgo.go
+@@ -230,7 +230,6 @@ func (inst *MgoInstance) run() error {
+ 		"--nssize", "1",
+ 		"--noprealloc",
+ 		"--smallfiles",
+-		"--nohttpinterface",
+ 		"--oplogSize", "10",
+ 		"--ipv6",
+ 		"--setParameter", "enableTestCommands=1",
+@@ -744,7 +743,7 @@ func (inst *MgoInstance) Reset() error {
+ 	logger.Infof("reset successfully reset admin password")
+ 	for _, name := range dbnames {
+ 		switch name {
+-		case "local", "config":
++		case "local", "config", "admin":
+ 			// don't delete these
+ 			continue
+ 		}
diff -Nru golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/series golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/series
--- golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-juju-testing-0.0~git20170608.2fe0e88/debian/patches/series	2018-04-13 15:46:26.000000000 +0000
@@ -0,0 +1 @@
+mongodb-3.6