diff --git a/gbpservice/tests/contrib/devstack/exercises/flavors.sh b/gbpservice/tests/contrib/devstack/exercises/flavors.sh
new file mode 100755
index 000000000..72cf25fb4
--- /dev/null
+++ b/gbpservice/tests/contrib/devstack/exercises/flavors.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# **gbp.sh**
+
+# Sanity check that gbp started if enabled
+
+echo "*********************************************************************"
+echo "Begin DevStack Exercise: $0"
+echo "*********************************************************************"
+
+# Settings
+# ========
+
+# This script exits on an error so that errors don't compound and you see
+# only the first error that occurred.
+set -o errexit
+
+# Keep track of the current directory
+EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
+TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
+
+# Import common functions
+source $TOP_DIR/functions
+
+# Import configuration
+source $TOP_DIR/openrc
+
+# Import exercise configuration
+source $TOP_DIR/exerciserc
+
+source $TOP_DIR/openrc demo demo
+
+# Print the commands being run so that we can see the command that triggers
+# an error.  It is also useful for following allowing as the install occurs.
+set -o xtrace
+
+neutron flavor-list
+
+set +o xtrace
+echo "*********************************************************************"
+echo "SUCCESS: End DevStack Exercise: $0"
+echo "*********************************************************************"
diff --git a/gbpservice/tests/contrib/devstack/local.conf b/gbpservice/tests/contrib/devstack/local.conf
index 1e1d2183e..82353079e 100644
--- a/gbpservice/tests/contrib/devstack/local.conf
+++ b/gbpservice/tests/contrib/devstack/local.conf
@@ -6,7 +6,7 @@ RABBIT_PASSWORD=abc123
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 SERVICE_TOKEN=abc123
 
-Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,group_policy,ncp
+Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,group_policy,ncp,flavors
 
 
 # Using group-policy branches