Depend on discover to fix python2.6 tests

It also fix a failure introduced by using 2.7-specific setUpClass.

Fixes: bug #1175753
Change-Id: I63ba61050602df92c654bd70519947965494df37
Merge "Depend on discover to fix python2.6 tests"