diff -Nru nova-21.0.0~b3~git2020041013.57ff308d6d/debian/changelog nova-21.0.0~b3~git2020041013.57ff308d6d/debian/changelog
--- nova-21.0.0~b3~git2020041013.57ff308d6d/debian/changelog	2020-04-10 18:00:26.000000000 +0000
+++ nova-21.0.0~b3~git2020041013.57ff308d6d/debian/changelog	2020-04-17 08:48:19.000000000 +0000
@@ -1,3 +1,15 @@
+nova (2:21.0.0~b3~git2020041013.57ff308d6d-0ubuntu2) focal; urgency=medium
+
+  * d/tests/nova-daemons: Skip validation that nova-scheduler is
+    running; this serivce requires configuration of both keystone and
+    the placement service which is beyond the scope of a single unit
+    autopkgtest.
+  * d/tests/control: Install nova-spiceproxy instead of nova-novncproxy
+    during testing as SPICE is the console option supported in Ubuntu
+    main.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 17 Apr 2020 09:48:19 +0100
+
 nova (2:21.0.0~b3~git2020041013.57ff308d6d-0ubuntu1) focal; urgency=medium
 
   * New upstream snapshot for OpenStack Ussuri.
diff -Nru nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/control nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/control
--- nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/control	2020-04-10 18:00:26.000000000 +0000
+++ nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/control	2020-04-17 08:48:19.000000000 +0000
@@ -4,7 +4,7 @@
  nova-api,
  nova-compute,
  nova-conductor,
- nova-novncproxy,
+ nova-spiceproxy,
  nova-scheduler,
  rabbitmq-server,
 Restrictions: needs-root, allow-stderr
diff -Nru nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/nova-daemons nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/nova-daemons
--- nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/nova-daemons	2020-04-10 18:00:26.000000000 +0000
+++ nova-21.0.0~b3~git2020041013.57ff308d6d/debian/tests/nova-daemons	2020-04-17 08:48:19.000000000 +0000
@@ -3,7 +3,7 @@
 # Testing nova-daemons
 #---------------------
 set -e
-DAEMONS=('nova-scheduler' 'nova-api')
+DAEMONS=('nova-api')
 ret=0
 
 mysql -u root << EOF