diff --git a/networking-calico/.testr.conf b/networking-calico/.testr.conf
index 0ec56a34adc..2a660613816 100644
--- a/networking-calico/.testr.conf
+++ b/networking-calico/.testr.conf
@@ -3,10 +3,8 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-0} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
 	     sh -c '\
-             ${PYTHON:-python} -m coverage run -a -m nose2 -v -s networking_calico/tests && \
-             ${PYTHON:-python} -m coverage run -a -m nose2 -v networking_calico.plugins.ml2.drivers.calico.test.test_election && \
-             ${PYTHON:-python} -m coverage run -a -m nose2 -v networking_calico.plugins.ml2.drivers.calico.test.test_plugin_etcd && \
-             ${PYTHON:-python} -m coverage run -a -m nose2 -v networking_calico.plugins.ml2.drivers.calico.test.test_compaction'
+             ${PYTHON:-python} -m coverage run -a -m subunit.run discover -t . networking_calico/tests $LISTOPT $IDOPTION && \
+             ${PYTHON:-python} -m coverage run -a -m subunit.run discover -t . networking_calico/plugins/ml2/drivers/calico/test $LISTOPT $IDOPTION'
 
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/networking-calico/test-requirements.txt b/networking-calico/test-requirements.txt
index 856f9bf630d..ab2c3199b37 100644
--- a/networking-calico/test-requirements.txt
+++ b/networking-calico/test-requirements.txt
@@ -20,5 +20,3 @@ neutron>=16,<17
 neutron-lib==2.3.0
 mock>=3.0.0 # BSD
 pyroute2<0.6.0 # Apache v2
-
-nose2