diff --git a/tox.ini b/tox.ini
index e686bacc2f..d2c23056d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,18 @@ commands =
     python -bb -m testtools.run \
         trove/tests/unittests/api/common/test_extensions.py \
         trove/tests/unittests/api/common/test_limits.py \
+        trove/tests/unittests/api/test_versions.py \
+        trove/tests/unittests/backup/test_backup_controller.py \
+        trove/tests/unittests/backup/test_backup_models.py \
+        trove/tests/unittests/cluster/test_cassandra_cluster.py \
+        trove/tests/unittests/cluster/test_cluster.py \
+        trove/tests/unittests/cluster/test_cluster_models.py \
+        trove/tests/unittests/cluster/test_cluster_pxc_controller.py \
+        trove/tests/unittests/cluster/test_cluster_redis_controller.py \
+        trove/tests/unittests/cluster/test_cluster_vertica_controller.py \
+        trove/tests/unittests/cluster/test_cluster_views.py \
+        trove/tests/unittests/cluster/test_mongodb_cluster.py \
+        trove/tests/unittests/cluster/test_vertica_cluster.py \
         trove/tests/unittests/common/test_common_extensions.py \
         trove/tests/unittests/common/test_context.py \
         trove/tests/unittests/common/test_crypto_utils.py \
@@ -43,12 +55,45 @@ commands =
         trove/tests/unittests/common/test_template.py \
         trove/tests/unittests/common/test_utils.py \
         trove/tests/unittests/common/test_wsgi.py \
+        trove/tests/unittests/conductor/test_conf.py \
+        trove/tests/unittests/conductor/test_methods.py \
+        trove/tests/unittests/configuration/test_configuration_controller.py \
+        trove/tests/unittests/datastore/test_capability.py \
+        trove/tests/unittests/datastore/test_datastore.py \
+        trove/tests/unittests/datastore/test_datastore_version_metadata.py \
         trove/tests/unittests/datastore/test_datastore_versions.py \
+        trove/tests/unittests/db/test_migration_utils.py \
         trove/tests/unittests/dns/test_designate_driver.py \
+        trove/tests/unittests/guestagent/test_agent_heartbeats_models.py \
+        trove/tests/unittests/guestagent/test_api.py \
+        trove/tests/unittests/guestagent/test_galera_cluster_api.py \
+        trove/tests/unittests/guestagent/test_guestagent_utils.py \
+        trove/tests/unittests/guestagent/test_models.py \
+        trove/tests/unittests/guestagent/test_query.py \
+        trove/tests/unittests/guestagent/test_service.py \
+        trove/tests/unittests/guestagent/test_vertica_api.py \
         trove/tests/unittests/instance/test_instance_controller.py \
         trove/tests/unittests/instance/test_instance_models.py \
         trove/tests/unittests/instance/test_instance_status.py \
-        trove/tests/unittests/instance/test_instance_views.py
+        trove/tests/unittests/instance/test_instance_views.py \
+        trove/tests/unittests/mgmt/test_clusters.py \
+        trove/tests/unittests/mgmt/test_datastore_controller.py \
+        trove/tests/unittests/mgmt/test_datastores.py \
+        trove/tests/unittests/mgmt/test_models.py \
+        trove/tests/unittests/module/test_module_controller.py \
+        trove/tests/unittests/module/test_module_views.py \
+        trove/tests/unittests/mysql/test_user_controller.py \
+        trove/tests/unittests/network/test_neutron_driver.py \
+        trove/tests/unittests/quota/test_quota.py \
+        trove/tests/unittests/router/test_router.py \
+        trove/tests/unittests/secgroups/test_security_group.py \
+        trove/tests/unittests/taskmanager/test_api.py \
+        trove/tests/unittests/taskmanager/test_clusters.py \
+        trove/tests/unittests/taskmanager/test_galera_clusters.py \
+        trove/tests/unittests/taskmanager/test_manager.py \
+        trove/tests/unittests/taskmanager/test_vertica_clusters.py \
+        trove/tests/unittests/upgrade/test_controller.py \
+        trove/tests/unittests/upgrade/test_models.py
 
 
 [testenv:debug]