diff --git a/devstack/settings b/devstack/settings
index 2dff5fb390..02632a66c1 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -71,3 +71,8 @@ TROVE_DEVSTACK_FILES=${TROVE_DEVSTACK_DIR}/files
 TROVE_WSGI_DIR=${TROVE_WSGI_DIR:-/var/www/trove}
 
 enable_service trove tr-api tr-tmgr tr-cond
+
+# Trove CI tests server group anti-affinity policies and therefore needs
+# Nova to use a single MQ for the computes to talk to the scheduler.
+CELLSV2_SETUP=singleconductor
+
diff --git a/trove/tests/examples/snippets.py b/trove/tests/examples/snippets.py
index 65d901985c..06c7601eee 100644
--- a/trove/tests/examples/snippets.py
+++ b/trove/tests/examples/snippets.py
@@ -33,7 +33,11 @@ from trove.tests.config import CONFIG
 from trove.tests.examples.client import JsonClient
 from trove.tests.examples.client import SnippetWriter
 
-trove_client._logger.setLevel(logging.CRITICAL)
+# troveclient.compat.client._logger was changed to LOG in 2.11.0
+if hasattr(trove_client, '_logger'):
+    trove_client._logger.setLevel(logging.CRITICAL)
+elif hasattr(trove_client, 'LOG'):
+    trove_client.LOG.setLevel(logging.CRITICAL)
 
 FAKE_INFO = {'m': 30, 's': 0, 'uuid': 'abcdef00-aaaa-aaaa-aaaa-bbbbbbbbbbbb'}
 EXAMPLE_BACKUP_ID = "a9832168-7541-4536-b8d9-a8a9b79cf1b4"