2 files changed, 5 insertions, 11 deletions
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index d6008876a00..151e98d3905 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,17 +19,12 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Test_Contacts extends PHPUnit_Framework_TestCase
-{
-
-	public function setUp() {
-
+class Test_Contacts extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
 		OCP\Contacts::clear();
 	}
 
-	public function tearDown() {
-	}
-
 	public function testDisabledIfEmpty() {
 		// pretty simple
 		$this->assertFalse(OCP\Contacts::isEnabled());
diff --git a/tests/lib/public/ocpconfig.php b/tests/lib/public/ocpconfig.php
index 43a9ca625ee..947d2b3c9ef 100644
--- a/tests/lib/public/ocpconfig.php
+++ b/tests/lib/public/ocpconfig.php
@@ -19,12 +19,11 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Test_OCPConfig extends PHPUnit_Framework_TestCase
-{
+class Test_OCPConfig extends \Test\TestCase {
 
 	public function testSetAppValueIfSetToNull() {
 
-		$key = uniqid("key-");
+		$key = $this->getUniqueID('key-');
 
 		$result = \OCP\Config::setAppValue('unit-test', $key, null);
 		$this->assertTrue($result);