diff -Nru neutron-10.0.0/debian/changelog neutron-10.0.0/debian/changelog
--- neutron-10.0.0/debian/changelog	2017-03-15 10:39:34.000000000 +0000
+++ neutron-10.0.0/debian/changelog	2017-03-17 17:25:06.000000000 +0000
@@ -1,3 +1,11 @@
+neutron (2:10.0.0-0ubuntu3) zesty; urgency=medium
+
+  * d/rules: Switch to direct use of ostestr.
+  * d/p/fix-db-path.patch: Drop patch, we do want to run unit tests with
+    an in-memory sqlite db otherwise they stomp all over each other.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 17 Mar 2017 17:25:06 +0000
+
 neutron (2:10.0.0-0ubuntu2) zesty; urgency=medium
 
   * d/control: Bump minimum pecan version to 1.1.2 (LP: #1668578).
diff -Nru neutron-10.0.0/debian/patches/fix-db-path.patch neutron-10.0.0/debian/patches/fix-db-path.patch
--- neutron-10.0.0/debian/patches/fix-db-path.patch	2017-03-15 10:39:34.000000000 +0000
+++ neutron-10.0.0/debian/patches/fix-db-path.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Description: Dont use an in memory databse for unit tests.
-Author: Chuck Short
-Forwarded: not needed.
-diff -Naurp neutron-10.0.0.0rc1.orig/neutron/tests/etc/neutron.conf neutron-10.0.0.0rc1/neutron/tests/etc/neutron.conf
---- neutron-10.0.0.0rc1.orig/neutron/tests/etc/neutron.conf	2017-02-03 20:04:08.000000000 -0500
-+++ neutron-10.0.0.0rc1/neutron/tests/etc/neutron.conf	2017-02-20 09:36:25.010302770 -0500
-@@ -23,5 +23,5 @@ rpc_backend = fake
- lock_path = $state_path/lock
- 
- [database]
--connection = 'sqlite://'
-+connection = 'sqlite:////tmp/sqlite.db'
- 
diff -Nru neutron-10.0.0/debian/patches/series neutron-10.0.0/debian/patches/series
--- neutron-10.0.0/debian/patches/series	2017-03-15 10:39:34.000000000 +0000
+++ neutron-10.0.0/debian/patches/series	2017-03-17 17:25:06.000000000 +0000
@@ -1,4 +1,2 @@
 skip-iptest.patch
 flake8-legacy.patch
-fix-db-path.patch
-
diff -Nru neutron-10.0.0/debian/rules neutron-10.0.0/debian/rules
--- neutron-10.0.0/debian/rules	2017-03-15 10:39:34.000000000 +0000
+++ neutron-10.0.0/debian/rules	2017-03-17 17:25:06.000000000 +0000
@@ -43,5 +43,5 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P
+	ostestr
 endif