Mode to modern phpunit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

442 files changed, 2387 insertions, 2324 deletions

diff --git a/apps/admin_audit/tests/Actions/SecurityTest.php b/apps/admin_audit/tests/Actions/SecurityTest.php
index c7295452482..92fdaa98682 100644
--- a/apps/admin_audit/tests/Actions/SecurityTest.php
+++ b/apps/admin_audit/tests/Actions/SecurityTest.php
@@ -39,7 +39,7 @@ class SecurityTest extends TestCase {
 	/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
 	private $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(ILogger::class);
diff --git a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
index 727014b8fcb..a1cc6f915e3 100644
--- a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
+++ b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
@@ -36,7 +36,7 @@ class CommentersSorterTest extends TestCase {
 	/** @var  CommentersSorter */
 	protected $sorter;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->createMock(ICommentsManager::class);
diff --git a/apps/comments/tests/Unit/JSSettingsHelperTest.php b/apps/comments/tests/Unit/JSSettingsHelperTest.php
index 4133daef3ce..4b580024da4 100644
--- a/apps/comments/tests/Unit/JSSettingsHelperTest.php
+++ b/apps/comments/tests/Unit/JSSettingsHelperTest.php
@@ -34,7 +34,7 @@ class JSSettingsHelperTest extends TestCase {
 	/** @var  JSSettingsHelper */
 	protected $helper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->c = $this->createMock(IServerContainer::class);
diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php
index 1fb1cd7736e..617fcaf09b1 100644
--- a/apps/comments/tests/Unit/Notification/NotifierTest.php
+++ b/apps/comments/tests/Unit/Notification/NotifierTest.php
@@ -339,10 +339,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareDifferentApp() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->folder
 			->expects($this->never())
 			->method('getById');
@@ -376,10 +376,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareNotFound() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->folder
 			->expects($this->never())
 			->method('getById');
@@ -414,10 +414,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareDifferentSubject() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$displayName = 'Huraga';
 
 		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
@@ -477,10 +477,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareNotFiles() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$displayName = 'Huraga';
 
 		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
@@ -541,10 +541,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
 
-	/**
-	 * @expectedException \OCP\Notification\AlreadyProcessedException
-	 */
+	
 	public function testPrepareUnresolvableFileID() {
+		$this->expectException(\OCP\Notification\AlreadyProcessedException::class);
+
 		$displayName = 'Huraga';
 
 		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
diff --git a/apps/dav/lib/CalDAV/CachedSubscription.php b/apps/dav/lib/CalDAV/CachedSubscription.php
index 2d27f5b42c0..8331e2a8de1 100644
--- a/apps/dav/lib/CalDAV/CachedSubscription.php
+++ b/apps/dav/lib/CalDAV/CachedSubscription.php
@@ -108,9 +108,7 @@ class CachedSubscription extends \Sabre\CalDAV\Calendar {
 		return parent::getOwner();
 	}
 
-	/**
-	 *
-	 */
+	
 	public function delete() {
 		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
 	}
diff --git a/apps/dav/lib/CalDAV/CalendarHome.php b/apps/dav/lib/CalDAV/CalendarHome.php
index 3e1ee361687..23c7d692c6c 100644
--- a/apps/dav/lib/CalDAV/CalendarHome.php
+++ b/apps/dav/lib/CalDAV/CalendarHome.php
@@ -154,9 +154,7 @@ class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
 	}
 
-	/**
-	 *
-	 */
+	
 	public function enableCachedSubscriptionsForThisRequest() {
 		$this->returnCachedSubscriptions = true;
 	}
diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
index e5a2bfa862f..4a8d9895dd7 100644
--- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
+++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
@@ -40,17 +40,18 @@ class AvatarHomeTest extends TestCase {
 	/** @var IAvatarManager | \PHPUnit_Framework_MockObject_MockObject */
 	private $avatarManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->avatarManager = $this->createMock(IAvatarManager::class);
 		$this->home = new AvatarHome(['uri' => 'principals/users/admin'], $this->avatarManager);
 	}
 
 	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
 	 * @dataProvider providesForbiddenMethods
 	 */
 	public function testForbiddenMethods($method) {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->home->$method('');
 	}
 
diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
index 3facbeb954d..8772f511486 100644
--- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
+++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
@@ -72,7 +72,7 @@ abstract class AbstractCalDavBackend extends TestCase {
 	const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group';
 	const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
@@ -106,7 +106,7 @@ abstract class AbstractCalDavBackend extends TestCase {
 		$this->cleanUpBackend();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->cleanUpBackend();
 		parent::tearDown();
 	}
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php
index 4d5bcea9966..a09cbed4fce 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php
@@ -56,7 +56,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIdentifier());
+		$this->assertIsString($filter->getIdentifier());
 	}
 
 	/**
@@ -66,7 +66,7 @@ class GenericTest extends TestCase {
 	public function testGetName($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getName());
+		$this->assertIsString($filter->getName());
 	}
 
 	/**
@@ -77,7 +77,7 @@ class GenericTest extends TestCase {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
 		$priority = $filter->getPriority();
-		$this->assertInternalType('int', $filter->getPriority());
+		$this->assertIsInt($filter->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -89,7 +89,7 @@ class GenericTest extends TestCase {
 	public function testGetIcon($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIcon());
+		$this->assertIsString($filter->getIcon());
 		$this->assertStringStartsWith('http', $filter->getIcon());
 	}
 
@@ -100,7 +100,7 @@ class GenericTest extends TestCase {
 	public function testFilterTypes($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->filterTypes([]));
+		$this->assertIsArray($filter->filterTypes([]));
 	}
 
 	/**
@@ -110,6 +110,6 @@ class GenericTest extends TestCase {
 	public function testAllowedApps($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->allowedApps());
+		$this->assertIsArray($filter->allowedApps());
 	}
 }
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
index 64f9b6f86af..2f48b359659 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
@@ -113,10 +113,11 @@ class BaseTest extends TestCase {
 
 	/**
 	 * @dataProvider dataGenerateObjectParameterThrows
-	 * @expectedException \InvalidArgumentException
 	 * @param mixed $eventData
 	 */
 	public function testGenerateObjectParameterThrows($eventData) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData]);
 	}
 
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Setting/GenericTest.php b/apps/dav/tests/unit/CalDAV/Activity/Setting/GenericTest.php
index 73ddebeccce..ebc4f19c7d8 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Setting/GenericTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Setting/GenericTest.php
@@ -55,7 +55,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getIdentifier());
+		$this->assertIsString($setting->getIdentifier());
 	}
 
 	/**
@@ -65,7 +65,7 @@ class GenericTest extends TestCase {
 	public function testGetName($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getName());
+		$this->assertIsString($setting->getName());
 	}
 
 	/**
@@ -76,7 +76,7 @@ class GenericTest extends TestCase {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
 		$priority = $setting->getPriority();
-		$this->assertInternalType('int', $setting->getPriority());
+		$this->assertIsInt($setting->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -88,7 +88,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeStream());
+		$this->assertIsBool($setting->canChangeStream());
 	}
 
 	/**
@@ -98,7 +98,7 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledStream());
+		$this->assertIsBool($setting->isDefaultEnabledStream());
 	}
 
 	/**
@@ -108,7 +108,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeMail());
+		$this->assertIsBool($setting->canChangeMail());
 	}
 
 	/**
@@ -118,6 +118,6 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledMail());
+		$this->assertIsBool($setting->isDefaultEnabledMail());
 	}
 }
diff --git a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
index d2935850e51..26b126ed8a7 100644
--- a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
@@ -46,7 +46,7 @@ class EnablePluginTest extends TestCase {
 
 	protected $response;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->createMock(\Sabre\DAV\Server::class);
diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
index 7d4463c81b4..57931549019 100644
--- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
+++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
@@ -52,11 +52,11 @@ class CachedSubscriptionObjectTest extends \Test\TestCase {
 		$this->assertEquals('BEGIN...', $calendarObject->get());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 * @expectedExceptionMessage Creating objects in a cached subscription is not allowed
-	 */
+	
 	public function testPut() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+		$this->expectExceptionMessage('Creating objects in a cached subscription is not allowed');
+
 		$backend = $this->createMock(CalDavBackend::class);
 		$calendarInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
@@ -72,11 +72,11 @@ class CachedSubscriptionObjectTest extends \Test\TestCase {
 		$calendarObject->put('');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 * @expectedExceptionMessage Deleting objects in a cached subscription is not allowed
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+		$this->expectExceptionMessage('Deleting objects in a cached subscription is not allowed');
+
 		$backend = $this->createMock(CalDavBackend::class);
 		$calendarInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
index 82f9af364da..4143cd6a4fe 100644
--- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
+++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
@@ -140,11 +140,11 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$calendar->propPatch($propPatch);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 * @expectedExceptionMessage Calendar object not found
-	 */
+	
 	public function testGetChild() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+		$this->expectExceptionMessage('Calendar object not found');
+
 		$backend = $this->createMock(CalDavBackend::class);
 		$calendarInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
@@ -235,11 +235,11 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$this->assertInstanceOf(CachedSubscriptionObject::class, $res[1]);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 * @expectedExceptionMessage Creating objects in cached subscription is not allowed
-	 */
+	
 	public function testCreateFile() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+		$this->expectExceptionMessage('Creating objects in cached subscription is not allowed');
+
 		$backend = $this->createMock(CalDavBackend::class);
 		$calendarInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index 9a65b7c70c5..2c7e5bef56d 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -279,11 +279,11 @@ EOD;
 		$this->assertCount(0, $calendarObjects);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Calendar object with uid already exists in this calendar collection.
-	 */
+	
 	public function testMultipleCalendarObjectsWithSameUID() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
+
 		$calendarId = $this->createTestCalendar();
 
 		$calData = <<<'EOD'
diff --git a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
index c93e436b1a1..913c7aa985a 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
@@ -68,11 +68,11 @@ class CalendarHomeTest extends TestCase {
 		$this->calendarHome->createExtendedCollection('name123', $mkCol);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 * @expectedExceptionMessage The resource you tried to create has a reserved name
-	 */
+	
 	public function testCreateCalendarReservedName() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+		$this->expectExceptionMessage('The resource you tried to create has a reserved name');
+
 		/** @var MkCol | \PHPUnit_Framework_MockObject_MockObject $mkCol */
 		$mkCol = $this->createMock(MkCol::class);
 
diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php
index 8af6524b8aa..7b3baad5127 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php
@@ -43,7 +43,7 @@ class CalendarTest extends TestCase {
 	/** @var IConfig */
 	protected $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->l10n = $this->getMockBuilder(IL10N::class)
 			->disableOriginalConstructor()->getMock();
@@ -73,10 +73,10 @@ class CalendarTest extends TestCase {
 		$c->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteFromGroup() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
 		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->never())->method('updateShares');
diff --git a/apps/dav/tests/unit/CalDAV/PluginTest.php b/apps/dav/tests/unit/CalDAV/PluginTest.php
index 65b135cf905..e91c0e8391e 100644
--- a/apps/dav/tests/unit/CalDAV/PluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/PluginTest.php
@@ -30,7 +30,7 @@ class PluginTest extends TestCase  {
 	/** @var Plugin */
 	private $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->plugin = new Plugin();
diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
index 0bbfe997304..516ced5e0e7 100644
--- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
+++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
@@ -72,7 +72,7 @@ class PublicCalendarRootTest extends TestCase {
 	/** @var ILogger */
 	private $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$db = \OC::$server->getDatabaseConnection();
@@ -108,7 +108,7 @@ class PublicCalendarRootTest extends TestCase {
 			$this->l10n, $this->config);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 
 		if (is_null($this->backend)) {
diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
index 728905e6e6c..3de178fe491 100644
--- a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
+++ b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
@@ -48,7 +48,7 @@ class PluginTest extends TestCase {
 	/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)->
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
index 9ba3b15b23c..ba63c415c31 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
@@ -42,7 +42,7 @@ class BackendTest extends TestCase {
 	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
 	private $timeFactory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$query = self::$realDatabase->getQueryBuilder();
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php
index 305cf4866db..87d29e603c5 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php
@@ -68,7 +68,7 @@ abstract class AbstractNotificationProviderTest extends TestCase {
 	 */
 	protected $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(ILogger::class);
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index 2654ac8b45c..f2fcb21fbf8 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -61,7 +61,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 	/** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
 	private $mailer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->mailer = $this->createMock(IMailer::class);
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
index c2a95278b3f..3c2f175fdcb 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
@@ -61,7 +61,7 @@ class PushProviderTest extends AbstractNotificationProviderTest {
     /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
     private $timeFactory;
 
-    public function setUp(): void {
+    protected function setUp(): void {
         parent::setUp();
 
         $this->config = $this->createMock(IConfig::class);
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
index 9eecc37fb1a..7006e17dd8b 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
@@ -41,7 +41,7 @@ class NotificationProviderManagerTest extends TestCase {
 	/**
 	 * @throws \OCP\AppFramework\QueryException
 	 */
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->providerManager = new NotificationProviderManager();
@@ -49,22 +49,24 @@ class NotificationProviderManagerTest extends TestCase {
 	}
 
 	/**
-	 * @expectedException OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException
-	 * @expectedExceptionMessage Type NOT EXISTENT is not an accepted type of notification
 	 * @throws ProviderNotAvailableException
 	 * @throws NotificationTypeDoesNotExistException
 	 */
 	public function testGetProviderForUnknownType(): void{
+		$this->expectException(\OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException::class);
+		$this->expectExceptionMessage('Type NOT EXISTENT is not an accepted type of notification');
+
 		$this->providerManager->getProvider('NOT EXISTENT');
 	}
 
 	/**
-	 * @expectedException OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException
-	 * @expectedExceptionMessage No notification provider for type AUDIO available
 	 * @throws NotificationTypeDoesNotExistException
 	 * @throws ProviderNotAvailableException
 	 */
 	public function testGetProviderForUnRegisteredType(): void{
+		$this->expectException(\OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException::class);
+		$this->expectExceptionMessage('No notification provider for type AUDIO available');
+
 		$this->providerManager->getProvider('AUDIO');
 	}
 
@@ -80,11 +82,12 @@ class NotificationProviderManagerTest extends TestCase {
 	}
 
 	/**
-	 * @expectedExceptionMessage Invalid notification provider registered
-	 * @expectedException \InvalidArgumentException
 	 * @throws \OCP\AppFramework\QueryException
 	 */
 	public function testRegisterBadProvider(): void{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid notification provider registered');
+
 		$this->providerManager->registerProvider(Capabilities::class);
 	}
 
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotifierTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotifierTest.php
index 6bb6a8be1c8..6d64f2615de 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotifierTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotifierTest.php
@@ -98,12 +98,12 @@ class NotifierTest extends TestCase {
 		$this->assertEquals($this->notifier->getName(), 'Calendar');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Notification not from this app
-	 */
+	
 	public function testPrepareWrongApp(): void
 	{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Notification not from this app');
+
 		/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
 		$notification = $this->createMock(INotification::class);
 
@@ -116,11 +116,11 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($notification, 'en');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Unknown subject
-	 */
+	
 	public function testPrepareWrongSubject() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Unknown subject');
+
 		/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
 		$notification = $this->createMock(INotification::class);
 
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
index 503478acc01..177a86ebab9 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
@@ -184,7 +184,7 @@ END:VEVENT
 END:VCALENDAR
 EOD;
 
-    public function setUp(): void {
+    protected function setUp(): void {
 		parent::setUp();
 
         $this->backend = $this->createMock(Backend::class);
diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
index 5f59af260c1..9b2e3d32232 100644
--- a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
@@ -64,7 +64,7 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 	/** @var string */
 	protected $expectedCUType;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userSession = $this->createMock(IUserSession::class);
diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php
index 5d9e3e8455c..0bbe5a7c557 100644
--- a/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php
@@ -25,7 +25,7 @@ namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking;
 use OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend;
 
 Class ResourcePrincipalBackendTest extends AbstractPrincipalBackendTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->principalBackend = new ResourcePrincipalBackend(self::$realDatabase,
diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php
index 34fa8e38f14..357f381c878 100644
--- a/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php
@@ -25,7 +25,7 @@ namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking;
 use OCA\DAV\CalDAV\ResourceBooking\RoomPrincipalBackend;
 
 Class RoomPrincipalBackendTest extends AbstractPrincipalBackendTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->principalBackend = new RoomPrincipalBackend(self::$realDatabase,
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
index 58342db12f2..44022a2b114 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -48,7 +48,7 @@ use Test\TestCase;
 
 class IMipPluginTest extends TestCase {
 
-        public function setUp(): void {
+        protected function setUp(): void {
 		$this->mailMessage = $this->createMock(IMessage::class);
 		$this->mailMessage->method('setFrom')->willReturn($this->mailMessage);
 		$this->mailMessage->method('setReplyTo')->willReturn($this->mailMessage);
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
index a489839fc82..f75580142a3 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
@@ -36,7 +36,7 @@ class PluginTest extends TestCase  {
 	/** @var Server|\PHPUnit_Framework_MockObject_MockObject */
 	private $server;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->createMock(Server::class);
diff --git a/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php b/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php
index 30cf768feab..d62c2528ca9 100644
--- a/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php
+++ b/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php
@@ -131,11 +131,11 @@ XML;
 		);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage {http://nextcloud.com/ns}prop-filter or {http://nextcloud.com/ns}param-filter given without any {http://nextcloud.com/ns}comp-filter
-	 */
+	
 	public function testRequiresCompFilter() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('{http://nextcloud.com/ns}prop-filter or {http://nextcloud.com/ns}param-filter given without any {http://nextcloud.com/ns}comp-filter');
+
 		$xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <nc:calendar-search xmlns:nc="http://nextcloud.com/ns" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:">
@@ -158,11 +158,11 @@ XML;
 		$this->parse($xml);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage The {http://nextcloud.com/ns}filter element is required for this request
-	 */
+	
 	public function testRequiresFilter() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('The {http://nextcloud.com/ns}filter element is required for this request');
+
 		$xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <nc:calendar-search xmlns:nc="http://nextcloud.com/ns" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:">
@@ -176,11 +176,11 @@ XML;
 		$this->parse($xml);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage {http://nextcloud.com/ns}search-term is required for this request
-	 */
+	
 	public function testNoSearchTerm() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('{http://nextcloud.com/ns}search-term is required for this request');
+
 		$xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <nc:calendar-search xmlns:nc="http://nextcloud.com/ns" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:">
@@ -204,11 +204,11 @@ XML;
 		$this->parse($xml);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage At least one{http://nextcloud.com/ns}prop-filter or {http://nextcloud.com/ns}param-filter is required for this request
-	 */
+	
 	public function testCompOnly() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('At least one{http://nextcloud.com/ns}prop-filter or {http://nextcloud.com/ns}param-filter is required for this request');
+
 		$xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <nc:calendar-search xmlns:nc="http://nextcloud.com/ns" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:">
diff --git a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
index e0cdfaf732f..65a225646e2 100644
--- a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
@@ -36,7 +36,7 @@ class SearchPluginTest extends TestCase {
 	/** @var \OCA\DAV\CalDAV\Search\SearchPlugin $plugin */
 	protected $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->createMock(\Sabre\DAV\Server::class);
diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
index 02468e9686f..f3abfbbde9e 100644
--- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -55,7 +55,7 @@ class AddressBookImplTest extends TestCase {
 	/** @var  VCard | \PHPUnit_Framework_MockObject_MockObject */
 	private $vCard;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->addressBookInfo = [
diff --git a/apps/dav/tests/unit/CardDAV/AddressBookTest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php
index 8fa6023f0d2..e801eb22b53 100644
--- a/apps/dav/tests/unit/CardDAV/AddressBookTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookTest.php
@@ -51,10 +51,10 @@ class AddressBookTest extends TestCase {
 		$c->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteFromGroup() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */
 		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->never())->method('updateShares');
@@ -73,10 +73,10 @@ class AddressBookTest extends TestCase {
 		$c->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testPropPatch() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */
 		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
 		$calendarInfo = [
diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index 6bfda95a70e..82333143958 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -52,7 +52,7 @@ class BirthdayServiceTest extends TestCase {
 	/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->calDav = $this->createMock(CalDavBackend::class);
diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
index adc6df952ac..f2a85cb9dbb 100644
--- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
+++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
@@ -121,7 +121,7 @@ class CardDavBackendTest extends TestCase {
 						'N:TestNoUID;;;;'.PHP_EOL.
 						'END:VCARD';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
@@ -159,7 +159,7 @@ class CardDavBackendTest extends TestCase {
 		$this->tearDown();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 
 		if (is_null($this->backend)) {
@@ -631,10 +631,10 @@ class CardDavBackendTest extends TestCase {
 			$this->invokePrivate($this->backend, 'getCardId', [1, 'uri']));
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testGetCardIdFailed() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->invokePrivate($this->backend, 'getCardId', [1, 'uri']);
 	}
 
@@ -784,10 +784,10 @@ class CardDavBackendTest extends TestCase {
 		$this->assertSame('uri', $this->backend->getCardUri($id));
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testGetCardUriFailed() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->backend->getCardUri(1);
 	}
 
diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php
index 8484d3447f2..e308bd71cfc 100644
--- a/apps/dav/tests/unit/CardDAV/ConverterTest.php
+++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php
@@ -39,7 +39,7 @@ class ConverterTest extends  TestCase {
 	/** @var  AccountManager | PHPUnit_Framework_MockObject_MockObject */
 	private $accountManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->accountManager = $this->createMock(AccountManager::class);
diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
index 3fee2bcc827..d7f8ce5d159 100644
--- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -53,7 +53,7 @@ class ImageExportPluginTest extends TestCase {
 	/** @var PhotoCache|\PHPUnit_Framework_MockObject_MockObject */
 	private $cache;
 
-	function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(RequestInterface::class);
diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
index 105612b5cb9..1cb7bc31f2f 100644
--- a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
@@ -44,7 +44,7 @@ class PluginTest extends TestCase {
 	/** @var IShareable | \PHPUnit_Framework_MockObject_MockObject */
 	private $book;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		
 		/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
diff --git a/apps/dav/tests/unit/Command/ListCalendarsTest.php b/apps/dav/tests/unit/Command/ListCalendarsTest.php
index 9cd02805133..0b381857573 100644
--- a/apps/dav/tests/unit/Command/ListCalendarsTest.php
+++ b/apps/dav/tests/unit/Command/ListCalendarsTest.php
@@ -58,11 +58,11 @@ class ListCalendarsTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testWithBadUser()
 	{
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->userManager->expects($this->once())
 			->method('userExists')
 			->with(self::USERNAME)
diff --git a/apps/dav/tests/unit/Command/MoveCalendarTest.php b/apps/dav/tests/unit/Command/MoveCalendarTest.php
index 50c1a57e0a8..c097427b239 100644
--- a/apps/dav/tests/unit/Command/MoveCalendarTest.php
+++ b/apps/dav/tests/unit/Command/MoveCalendarTest.php
@@ -89,12 +89,13 @@ class MoveCalendarTest extends TestCase {
 	/**
 	 * @dataProvider dataExecute
 	 *
-	 * @expectedException InvalidArgumentException
 	 * @param $userOriginExists
 	 * @param $userDestinationExists
 	 */
 	public function testWithBadUserOrigin($userOriginExists, $userDestinationExists)
 	{
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->userManager->expects($this->at(0))
 			->method('userExists')
 			->with('user')
@@ -115,12 +116,12 @@ class MoveCalendarTest extends TestCase {
 		]);
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 * @expectedExceptionMessage User <user> has no calendar named <personal>. You can run occ dav:list-calendars to list calendars URIs for this user.
-	 */
+	
 	public function testMoveWithInexistantCalendar()
 	{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('User <user> has no calendar named <personal>. You can run occ dav:list-calendars to list calendars URIs for this user.');
+
 		$this->userManager->expects($this->at(0))
 			->method('userExists')
 			->with('user')
@@ -143,12 +144,12 @@ class MoveCalendarTest extends TestCase {
 		]);
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 * @expectedExceptionMessage User <user2> already has a calendar named <personal>.
-	 */
+	
 	public function testMoveWithExistingDestinationCalendar()
 	{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('User <user2> already has a calendar named <personal>.');
+
 		$this->userManager->expects($this->at(0))
 			->method('userExists')
 			->with('user')
diff --git a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
index 1e415ceafca..7847273c975 100644
--- a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
+++ b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
@@ -37,7 +37,7 @@ use Test\TestCase;
  */
 class RemoveInvalidSharesTest extends TestCase {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$db = \OC::$server->getDatabaseConnection();
 
diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
index 3c230ccfd43..b709fd01e01 100644
--- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
@@ -47,7 +47,7 @@ class CommentsNodeTest extends \Test\TestCase {
 	protected $logger;
 	protected $userSession;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)
@@ -107,10 +107,10 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteForbidden() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -149,10 +149,10 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->assertSame($this->node->getName(), $id);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+
 		$this->node->setName('666');
 	}
 
@@ -194,11 +194,11 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->assertTrue($this->node->updateComment($msg));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage buh!
-	 */
+	
 	public function testUpdateCommentLogException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('buh!');
+
 		$msg = null;
 
 		$user = $this->getMockBuilder(IUser::class)
@@ -235,11 +235,11 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Message exceeds allowed character limit of
-	 */
+	
 	public function testUpdateCommentMessageTooLongException() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Message exceeds allowed character limit of');
+
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -274,10 +274,10 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment('foo');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testUpdateForbiddenByUser() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$msg = 'HaXX0r';
 
 		$user = $this->getMockBuilder(IUser::class)
@@ -309,10 +309,10 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testUpdateForbiddenByType() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$msg = 'HaXX0r';
 
 		$user = $this->getMockBuilder(IUser::class)
@@ -339,10 +339,10 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testUpdateForbiddenByNotLoggedIn() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$msg = 'HaXX0r';
 
 		$this->userSession->expects($this->once())
diff --git a/apps/dav/tests/unit/Comments/CommentsPluginTest.php b/apps/dav/tests/unit/Comments/CommentsPluginTest.php
index 537989d9404..6cf23d1d42e 100644
--- a/apps/dav/tests/unit/Comments/CommentsPluginTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsPluginTest.php
@@ -54,7 +54,7 @@ class CommentsPluginTest extends \Test\TestCase {
 	/** @var CommentsPluginImplementation */
 	private $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->tree = $this->getMockBuilder(Tree::class)
 			->disableOriginalConstructor()
@@ -170,10 +170,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testCreateCommentInvalidObject() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$commentData = [
 			'actorType' => 'users',
 			'verb' => 'comment',
@@ -252,10 +252,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testCreateCommentInvalidActor() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$commentData = [
 			'actorType' => 'robots',
 			'verb' => 'comment',
@@ -340,10 +340,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\UnsupportedMediaType
-	 */
+	
 	public function testCreateCommentUnsupportedMediaType() {
+		$this->expectException(\Sabre\DAV\Exception\UnsupportedMediaType::class);
+
 		$commentData = [
 			'actorType' => 'users',
 			'verb' => 'comment',
@@ -428,10 +428,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testCreateCommentInvalidPayload() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$commentData = [
 			'actorType' => 'users',
 			'verb' => '',
@@ -522,11 +522,11 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Message exceeds allowed character limit of
-	 */
+	
 	public function testCreateCommentMessageTooLong() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Message exceeds allowed character limit of');
+
 		$commentData = [
 			'actorType' => 'users',
 			'verb' => 'comment',
@@ -616,10 +616,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\ReportNotSupported
-	 */
+	
 	public function testOnReportInvalidNode() {
+		$this->expectException(\Sabre\DAV\Exception\ReportNotSupported::class);
+
 		$path = 'totally/unrelated/13';
 
 		$this->tree->expects($this->any())
@@ -639,10 +639,10 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->plugin->onReport(CommentsPluginImplementation::REPORT_NAME, [], '/' . $path);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\ReportNotSupported
-	 */
+	
 	public function testOnReportInvalidReportName() {
+		$this->expectException(\Sabre\DAV\Exception\ReportNotSupported::class);
+
 		$path = 'comments/files/42';
 
 		$this->tree->expects($this->any())
diff --git a/apps/dav/tests/unit/Comments/EntityCollectionTest.php b/apps/dav/tests/unit/Comments/EntityCollectionTest.php
index 2097c7ef03a..bb3992401f2 100644
--- a/apps/dav/tests/unit/Comments/EntityCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/EntityCollectionTest.php
@@ -45,7 +45,7 @@ class EntityCollectionTest extends \Test\TestCase {
 	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userSession;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)
@@ -89,10 +89,10 @@ class EntityCollectionTest extends \Test\TestCase {
 		$this->assertTrue($node instanceof \OCA\DAV\Comments\CommentNode);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildException() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->commentsManager->expects($this->once())
 			->method('get')
 			->with('55')
diff --git a/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php
index 9286b46d2b0..038dea82fee 100644
--- a/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php
@@ -46,7 +46,7 @@ class EntityTypeCollectionTest extends \Test\TestCase {
 
 	protected $childMap = [];
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)
@@ -92,17 +92,17 @@ class EntityTypeCollectionTest extends \Test\TestCase {
 		$this->assertTrue($ec instanceof EntityCollectionImplemantation);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildException() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->collection->getChild('17');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 */
+	
 	public function testGetChildren() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+
 		$this->collection->getChildren();
 	}
 }
diff --git a/apps/dav/tests/unit/Comments/RootCollectionTest.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php
index a0e72bcd425..cee5afc0eb3 100644
--- a/apps/dav/tests/unit/Comments/RootCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php
@@ -53,7 +53,7 @@ class RootCollectionTest extends \Test\TestCase {
 	/** @var \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject */
 	protected $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->user = $this->getMockBuilder(IUser::class)
@@ -106,17 +106,17 @@ class RootCollectionTest extends \Test\TestCase {
 		});
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testCreateFile() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->collection->createFile('foo');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testCreateDirectory() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->collection->createDirectory('foo');
 	}
 
@@ -126,18 +126,18 @@ class RootCollectionTest extends \Test\TestCase {
 		$this->assertTrue($etc instanceof EntityTypeCollectionImplementation);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildInvalid() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->prepareForInitCollections();
 		$this->collection->getChild('robots');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 */
+	
 	public function testGetChildNoAuth() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+
 		$this->collection->getChild('files');
 	}
 
@@ -150,10 +150,10 @@ class RootCollectionTest extends \Test\TestCase {
 		}
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 */
+	
 	public function testGetChildrenNoAuth() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+
 		$this->collection->getChildren();
 	}
 
@@ -167,17 +167,17 @@ class RootCollectionTest extends \Test\TestCase {
 		$this->assertFalse($this->collection->childExists('robots'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 */
+	
 	public function testChildExistsNoAuth() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+
 		$this->collection->childExists('files');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->collection->delete();
 	}
 
@@ -185,10 +185,10 @@ class RootCollectionTest extends \Test\TestCase {
 		$this->assertSame('comments', $this->collection->getName());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->collection->setName('foobar');
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
index 447a10afc79..60ec3186ed6 100644
--- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
@@ -60,7 +60,7 @@ class AuthTest extends TestCase {
 	/** @var Throttler */
 	private $throttler;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->session = $this->getMockBuilder(ISession::class)
 			->disableOriginalConstructor()->getMock();
@@ -220,10 +220,10 @@ class AuthTest extends TestCase {
 		$this->assertFalse($this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden
-	 */
+	
 	public function testValidateUserPassWithPasswordLoginForbidden() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden::class);
+
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
@@ -329,11 +329,11 @@ class AuthTest extends TestCase {
 		$this->auth->check($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 * @expectedExceptionMessage 2FA challenge not passed.
-	 */
+	
 	public function testAuthenticateAlreadyLoggedInWithoutTwoFactorChallengePassed() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+		$this->expectExceptionMessage('2FA challenge not passed.');
+
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -383,11 +383,11 @@ class AuthTest extends TestCase {
 		$this->auth->check($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 * @expectedExceptionMessage CSRF check not passed.
-	 */
+	
 	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDavAuthenticated() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+		$this->expectExceptionMessage('CSRF check not passed.');
+
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -564,11 +564,11 @@ class AuthTest extends TestCase {
 		$this->assertEquals([false, 'No \'Authorization: Basic\' header found. Either the client didn\'t send one, or the server is misconfigured'], $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotAuthenticated
-	 * @expectedExceptionMessage Cannot authenticate over ajax calls
-	 */
+	
 	public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjax() {
+		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+		$this->expectExceptionMessage('Cannot authenticate over ajax calls');
+
 		/** @var \Sabre\HTTP\RequestInterface $httpRequest */
 		$httpRequest = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
index 2af8fc4c74d..b69c8af45ae 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
@@ -45,7 +45,7 @@ class BearerAuthTest extends TestCase {
 	/** @var BearerAuth */
 	private $bearerAuth;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userSession = $this->createMock(\OC\User\Session::class);
diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
index 03c1ef1ff93..a79186f59a5 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
@@ -42,7 +42,7 @@ class BlockLegacyClientPluginTest extends TestCase {
 	/** @var BlockLegacyClientPlugin */
 	private $blockLegacyClientVersionPlugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)
@@ -67,10 +67,11 @@ class BlockLegacyClientPluginTest extends TestCase {
 	/**
 	 * @dataProvider oldDesktopClientProvider
 	 * @param string $userAgent
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage Unsupported client version.
 	 */
 	public function testBeforeHandlerException($userAgent) {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('Unsupported client version.');
+
 		/** @var \Sabre\HTTP\RequestInterface | PHPUnit_Framework_MockObject_MockObject $request */
 		$request = $this->createMock('\Sabre\HTTP\RequestInterface');
 		$request
diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
index b605aba2bc2..2eda470b255 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
@@ -40,7 +40,7 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
 	protected $userSession;
 	protected $server;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)
diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
index 5685580c03a..69ebc8d2a34 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
@@ -45,7 +45,7 @@ class CopyEtagHeaderPluginTest extends TestCase {
 	/** @var Server */
 	private $server;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->plugin = new CopyEtagHeaderPlugin();
diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
index 69f67f607b2..de44606fc19 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
@@ -67,7 +67,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 	 */
 	private $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->tree = $this->getMockBuilder(Tree::class)
@@ -90,7 +90,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 		);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$connection = \OC::$server->getDatabaseConnection();
 		$deleteStatement = $connection->prepare(
 			'DELETE FROM `*PREFIX*properties`' .
diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
index ee64eb5bce6..a93ef7ee962 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -97,10 +97,10 @@ class DirectoryTest extends \Test\TestCase {
 		return new Directory($this->view, $this->info);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteRootFolderFails() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->info->expects($this->any())
 			->method('isDeletable')
 			->will($this->returnValue(true));
@@ -110,10 +110,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->delete();
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\Forbidden
-	 */
+	
 	public function testDeleteForbidden() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class);
+
 		// deletion allowed
 		$this->info->expects($this->once())
 			->method('isDeletable')
@@ -129,9 +129,7 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->delete();
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testDeleteFolderWhenAllowed() {
 		// deletion allowed
 		$this->info->expects($this->once())
@@ -148,10 +146,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteFolderFailsWhenNotAllowed() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->info->expects($this->once())
 			->method('isDeletable')
 			->will($this->returnValue(false));
@@ -160,10 +158,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteFolderThrowsWhenDeletionFailed() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		// deletion allowed
 		$this->info->expects($this->once())
 			->method('isDeletable')
@@ -218,10 +216,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->getChildren();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testGetChildrenNoPermission() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$info = $this->createMock(FileInfo::class);
 		$info->expects($this->any())
 			->method('isReadable')
@@ -231,10 +229,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->getChildren();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildNoPermission() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->info->expects($this->any())
 			->method('isReadable')
 			->will($this->returnValue(false));
@@ -243,10 +241,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->getChild('test');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
-	 */
+	
 	public function testGetChildThrowStorageNotAvailableException() {
+		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
+
 		$this->view->expects($this->once())
 			->method('getFileInfo')
 			->willThrowException(new \OCP\Files\StorageNotAvailableException());
@@ -255,10 +253,10 @@ class DirectoryTest extends \Test\TestCase {
 		$dir->getChild('.');
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\InvalidPath
-	 */
+	
 	public function testGetChildThrowInvalidPath() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\InvalidPath::class);
+
 		$this->view->expects($this->once())
 			->method('verifyPath')
 			->willThrowException(new \OCP\Files\InvalidPathException());
@@ -334,9 +332,10 @@ class DirectoryTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider moveFailedProvider
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
 	 */
 	public function testMoveFailed($source, $destination, $updatables, $deletables) {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->moveTest($source, $destination, $updatables, $deletables);
 	}
 
@@ -350,9 +349,10 @@ class DirectoryTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider moveFailedInvalidCharsProvider
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\InvalidPath
 	 */
 	public function testMoveFailedInvalidChars($source, $destination, $updatables, $deletables) {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\InvalidPath::class);
+
 		$this->moveTest($source, $destination, $updatables, $deletables);
 	}
 
@@ -403,11 +403,11 @@ class DirectoryTest extends \Test\TestCase {
 		$this->assertTrue($targetNode->moveInto(basename($destination), $source, $sourceNode));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage Could not copy directory b, target exists
-	 */
+	
 	public function testFailingMove() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('Could not copy directory b, target exists');
+
 		$source = 'a/b';
 		$destination = 'c/b';
 		$updatables = ['a' => true, 'a/b' => true, 'b' => true, 'c/b' => false];
diff --git a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
index 1d22579bdd1..e6555be814d 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
@@ -41,7 +41,7 @@ class DummyGetResponsePluginTest extends TestCase {
 	/** @var DummyGetResponsePlugin */
 	private $dummyGetResponsePlugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->dummyGetResponsePlugin = new DummyGetResponsePlugin();
diff --git a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
index c2c808a8d95..49b252eb1a1 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
@@ -44,7 +44,7 @@ class FakeLockerPluginTest extends TestCase {
 	/** @var FakeLockerPlugin */
 	private $fakeLockerPlugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->fakeLockerPlugin = new FakeLockerPlugin();
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index d0c18f6cd9e..a3cf4560387 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -62,7 +62,7 @@ class FileTest extends TestCase {
 	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		unset($_SERVER['HTTP_OC_CHUNKED']);
 		unset($_SERVER['CONTENT_LENGTH']);
@@ -78,7 +78,7 @@ class FileTest extends TestCase {
 		$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$userManager = \OC::$server->getUserManager();
 		$userManager->get($this->user)->delete();
 		unset($_SERVER['HTTP_OC_CHUNKED']);
@@ -815,9 +815,10 @@ class FileTest extends TestCase {
 	/**
 	 * Test setting name with setName() with invalid chars
 	 *
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\InvalidPath
 	 */
 	public function testSetNameInvalidChars() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\InvalidPath::class);
+
 		// setup
 		$view = $this->getMockBuilder(View::class)
 			->setMethods(['getRelativePath'])
@@ -834,8 +835,7 @@ class FileTest extends TestCase {
 		$file->setName('/super*star.txt');
 	}
 
-	/**
-	 */
+	
 	public function testUploadAbort() {
 		// setup
 		$view = $this->getMockBuilder(View::class)
@@ -879,9 +879,7 @@ class FileTest extends TestCase {
 		$this->assertEmpty($this->listPartFiles($view, ''), 'No stray part files');
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testDeleteWhenAllowed() {
 		// setup
 		$view = $this->getMockBuilder(View::class)
@@ -901,10 +899,10 @@ class FileTest extends TestCase {
 		$file->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteThrowsWhenDeletionNotAllowed() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		// setup
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
@@ -919,10 +917,10 @@ class FileTest extends TestCase {
 		$file->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDeleteThrowsWhenDeletionFailed() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		// setup
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
@@ -942,10 +940,10 @@ class FileTest extends TestCase {
 		$file->delete();
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\Forbidden
-	 */
+	
 	public function testDeleteThrowsWhenDeletionThrows() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class);
+
 		// setup
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
@@ -1112,10 +1110,10 @@ class FileTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
-	 */
+	
 	public function testGetFopenFails() {
+		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
+
 		$view = $this->getMockBuilder(View::class)
 			->setMethods(['fopen'])
 			->getMock();
@@ -1132,10 +1130,10 @@ class FileTest extends TestCase {
 		$file->get();
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\Forbidden
-	 */
+	
 	public function testGetFopenThrows() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class);
+
 		$view = $this->getMockBuilder(View::class)
 			->setMethods(['fopen'])
 			->getMock();
@@ -1152,10 +1150,10 @@ class FileTest extends TestCase {
 		$file->get();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetThrowsIfNoPermission() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$view = $this->getMockBuilder(View::class)
 			->setMethods(['fopen'])
 			->getMock();
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 564059cd1dc..45c11d0011a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -97,7 +97,7 @@ class FilesPluginTest extends TestCase {
 	 */
 	private $previewManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->server = $this->getMockBuilder(Server::class)
 			->disableOriginalConstructor()
@@ -462,10 +462,11 @@ class FilesPluginTest extends TestCase {
 	 * FolderA is an incoming shared folder and there are no delete permissions.
 	 * Thus moving /FolderA/test.txt to /test.txt should fail already on that check
 	 *
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage FolderA/test.txt cannot be deleted
 	 */
 	public function testMoveSrcNotDeletable() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('FolderA/test.txt cannot be deleted');
+
 		$fileInfoFolderATestTXT = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -507,11 +508,11 @@ class FilesPluginTest extends TestCase {
 		$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 * @expectedExceptionMessage FolderA/test.txt does not exist
-	 */
+	
 	public function testMoveSrcNotExist() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+		$this->expectExceptionMessage('FolderA/test.txt does not exist');
+
 		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
index ea58c50480c..14c6af122a2 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -85,7 +85,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	/** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject * */
 	private $appManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->tree = $this->getMockBuilder(Tree::class)
 			->disableOriginalConstructor()
@@ -603,10 +603,10 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->assertEquals(['222'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testProcessFilterRulesInvisibleTagAsUser() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
 			->will($this->returnValue(false));
diff --git a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
index a604757520d..a9c8929dee6 100644
--- a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
@@ -39,18 +39,18 @@ class MaintenancePluginTest extends TestCase {
 	/** @var MaintenancePlugin */
 	private $maintenancePlugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
 		$this->maintenancePlugin = new MaintenancePlugin($this->config);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
-	 * @expectedExceptionMessage System in maintenance mode.
-	 */
+	
 	public function testMaintenanceMode() {
+		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
+		$this->expectExceptionMessage('System in maintenance mode.');
+
 		$this->config
 			->expects($this->exactly(1))
 			->method('getSystemValueBool')
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index cd575e4ff3c..1c71d396de2 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -103,9 +103,10 @@ class ObjectTreeTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider copyDataProvider
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
 	 */
 	public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent) {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$view = $this->createMock(View::class);
 		$view->expects($this->never())
 			->method('verifyPath');
@@ -268,10 +269,10 @@ class ObjectTreeTest extends \Test\TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \OCA\DAV\Connector\Sabre\Exception\InvalidPath
-	 */
+	
 	public function testGetNodeForPathInvalidPath() {
+		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\InvalidPath::class);
+
 		$path = '/foo\bar';
 
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
index 5320bd28302..7836191450b 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
@@ -65,7 +65,7 @@ class PrincipalTest extends TestCase {
 	/** @var ProxyMapper | \PHPUnit_Framework_MockObject_MockObject */
 	private $proxyMapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->shareManager = $this->createMock(IManager::class);
@@ -209,11 +209,11 @@ class PrincipalTest extends TestCase {
 		$this->assertSame([], $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Principal not found
-	 */
+	
 	public function testGetGroupMemberSetEmpty() {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Principal not found');
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -334,11 +334,11 @@ class PrincipalTest extends TestCase {
 		$this->assertSame($expectedResponse, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Principal not found
-	 */
+	
 	public function testGetGroupMembershipEmpty() {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Principal not found');
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -348,11 +348,11 @@ class PrincipalTest extends TestCase {
 		$this->connector->getGroupMembership('principals/users/foo');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Setting members of the group is not supported yet
-	 */
+	
 	public function testSetGroupMembership() {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Setting members of the group is not supported yet');
+
 		$this->connector->setGroupMemberSet('principals/users/foo', ['foo']);
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index e5d229733c5..d09ed9cf681 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -85,10 +85,11 @@ class QuotaPluginTest extends TestCase {
 	}
 
 	/**
-	 * @expectedException \Sabre\DAV\Exception\InsufficientStorage
 	 * @dataProvider quotaExceededProvider
 	 */
 	public function testCheckExceededQuota($quota, $headers) {
+		$this->expectException(\Sabre\DAV\Exception\InsufficientStorage::class);
+
 		$this->init($quota);
 		$this->plugin->expects($this->never())
 			->method('getFileChunking');
@@ -209,9 +210,10 @@ class QuotaPluginTest extends TestCase {
 
 	/**
 	 * @dataProvider quotaChunkedFailProvider
-	 * @expectedException \Sabre\DAV\Exception\InsufficientStorage
 	 */
 	public function testCheckQuotaChunkedFail($quota, $chunkTotalSize, $headers) {
+		$this->expectException(\Sabre\DAV\Exception\InsufficientStorage::class);
+
 		$this->init($quota, 'sub/test.txt');
 
 		$mockChunking = $this->getMockBuilder(\OC_FileChunking::class)
diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
index 85d285f2c3b..96c2d3ba092 100644
--- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
@@ -66,7 +66,7 @@ class SharesPluginTest extends \Test\TestCase {
 	 */
 	private $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->tree = $this->createMock(Tree::class);
diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
index 384441f4495..a805a776ad8 100644
--- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
@@ -70,7 +70,7 @@ class TagsPluginTest extends \Test\TestCase {
 	 */
 	private $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->tree = $this->getMockBuilder(Tree::class)
diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
index 509ccb7e353..cc1273f5418 100644
--- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
+++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
@@ -57,7 +57,7 @@ class BirthdayCalendarControllerTest extends TestCase {
 	/** @var BirthdayCalendarController|\PHPUnit_Framework_MockObject_MockObject */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/dav/tests/unit/Controller/DirectControllerTest.php b/apps/dav/tests/unit/Controller/DirectControllerTest.php
index 18034891dc8..21282762745 100644
--- a/apps/dav/tests/unit/Controller/DirectControllerTest.php
+++ b/apps/dav/tests/unit/Controller/DirectControllerTest.php
@@ -59,7 +59,7 @@ class DirectControllerTest extends TestCase {
 	/** @var DirectController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
index 44ca70b9342..c465f62eba7 100644
--- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
+++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -52,7 +52,7 @@ class InvitationResponseControllerTest extends TestCase {
 	/** @var InvitationResponseServer|\PHPUnit_Framework_MockObject_MockObject */
 	private $responseServer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->dbConnection = $this->createMock(IDBConnection::class);
diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
index d43e42b93b7..9c4c20c945b 100644
--- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
@@ -45,7 +45,7 @@ class CustomPropertiesBackendTest extends TestCase {
 	/** @var CustomPropertiesBackend | \PHPUnit_Framework_MockObject_MockObject */
 	private $backend;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->tree = $this->createMock(Tree::class);
diff --git a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
index 356299dab56..f0fda89ee92 100644
--- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
+++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
@@ -49,7 +49,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 	/** @var GroupPrincipalBackend */
 	private $connector;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->shareManager = $this->createMock(IManager::class);
@@ -174,11 +174,11 @@ class GroupPrincipalTest extends \Test\TestCase {
 		$this->assertSame([], $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Setting members of the group is not supported yet
-	 */
+	
 	public function testSetGroupMembership() {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Setting members of the group is not supported yet');
+
 		$this->connector->setGroupMemberSet('principals/groups/foo', ['foo']);
 	}
 
diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php
index 6b64abc8442..2a5f52cc4bd 100644
--- a/apps/dav/tests/unit/DAV/HookManagerTest.php
+++ b/apps/dav/tests/unit/DAV/HookManagerTest.php
@@ -46,7 +46,7 @@ class HookManagerTest extends TestCase {
 	/** @var  EventDispatcherInterface | \PHPUnit_Framework_MockObject_MockObject  */
 	private $eventDispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->eventDispatcher = $this->createMock(EventDispatcherInterface::class);
 		$this->l10n = $this->createMock(IL10N::class);
diff --git a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
index 38eb86baf27..69a76c3f8f9 100644
--- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
+++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
@@ -44,7 +44,7 @@ class PluginTest extends TestCase {
 	/** @var IShareable | \PHPUnit_Framework_MockObject_MockObject */
 	private $book;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		
 		/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
diff --git a/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
index 5833847cfed..32d6d47c206 100644
--- a/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
@@ -80,13 +80,14 @@ class SystemPrincipalBackendTest extends TestCase {
 
 	/**
 	 * @dataProvider providesPrincipalForGetGroupMemberSet
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Principal not found
 	 *
 	 * @param string $principal
 	 * @throws \Sabre\DAV\Exception
 	 */
 	public function testGetGroupMemberSetExceptional($principal) {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Principal not found');
+
 		$backend = new SystemPrincipalBackend();
 		$backend->getGroupMemberSet($principal);
 	}
@@ -109,13 +110,14 @@ class SystemPrincipalBackendTest extends TestCase {
 
 	/**
 	 * @dataProvider providesPrincipalForGetGroupMembership
-	 * @expectedException \Sabre\DAV\Exception
-	 * @expectedExceptionMessage Principal not found
 	 *
 	 * @param string $principal
 	 * @throws \Sabre\DAV\Exception
 	 */
 	public function testGetGroupMembershipExceptional($principal) {
+		$this->expectException(\Sabre\DAV\Exception::class);
+		$this->expectExceptionMessage('Principal not found');
+
 		$backend = new SystemPrincipalBackend();
 		$backend->getGroupMembership($principal);
 	}
diff --git a/apps/dav/tests/unit/Direct/DirectFileTest.php b/apps/dav/tests/unit/Direct/DirectFileTest.php
index c48b34bb175..5d2831c5bde 100644
--- a/apps/dav/tests/unit/Direct/DirectFileTest.php
+++ b/apps/dav/tests/unit/Direct/DirectFileTest.php
@@ -49,7 +49,7 @@ class DirectFileTest extends TestCase {
 	/** @var DirectFile */
 	private $directFile;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->direct = Direct::fromParams([
diff --git a/apps/dav/tests/unit/Direct/DirectHomeTest.php b/apps/dav/tests/unit/Direct/DirectHomeTest.php
index 8a976ff5dbf..ca71be06274 100644
--- a/apps/dav/tests/unit/Direct/DirectHomeTest.php
+++ b/apps/dav/tests/unit/Direct/DirectHomeTest.php
@@ -58,7 +58,7 @@ class DirectHomeTest extends TestCase {
 	/** @var DirectHome */
 	private $directHome;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->directMapper = $this->createMock(DirectMapper::class);
diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
index b524af5f390..723fb9f4049 100644
--- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php
+++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
@@ -258,10 +258,10 @@ class FileSearchBackendTest extends TestCase {
 		$this->assertEquals('/files/test/test/path', $result[0]->href);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testSearchInvalidProp() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->willReturn($this->davFolder);
@@ -295,10 +295,10 @@ class FileSearchBackendTest extends TestCase {
 		return new Query($select, $from, $where, $orderBy, $limit);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testSearchNonFolder() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$davNode = $this->createMock(File::class);
 
 		$this->tree->expects($this->any())
diff --git a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
index f311b0f2cb3..344b6b7df51 100644
--- a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
+++ b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
@@ -48,7 +48,7 @@ class FilesDropPluginTest extends TestCase {
 	/** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $response;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->createMock(View::class);
diff --git a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
index 063bf485501..63dd3480b20 100644
--- a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
+++ b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
@@ -89,7 +89,7 @@ CREATED:20151214T091032Z
 END:VEVENT
 END:VCALENDAR';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(ILogger::class);
diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
index 2f65fc7c45f..0253592ede0 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
@@ -34,7 +34,7 @@ class AppleProvisioningNodeTest extends TestCase {
 	/** @var AppleProvisioningNode */
 	private $node;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
@@ -45,11 +45,11 @@ class AppleProvisioningNodeTest extends TestCase {
 		$this->assertEquals('apple-provisioning.mobileconfig', $this->node->getName());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage Renaming apple-provisioning.mobileconfig is forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('Renaming apple-provisioning.mobileconfig is forbidden');
+
 		$this->node->setName('foo');
 	}
 
@@ -57,11 +57,11 @@ class AppleProvisioningNodeTest extends TestCase {
 		$this->assertEquals(null, $this->node->getLastModified());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage apple-provisioning.mobileconfig may not be deleted
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('apple-provisioning.mobileconfig may not be deleted');
+
 		$this->node->delete();
 	}
 
@@ -76,11 +76,11 @@ class AppleProvisioningNodeTest extends TestCase {
 		], $this->node->getProperties([]));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 * @expectedExceptionMessage apple-provisioning.mobileconfig's properties may not be altered.
-	 */
+	
 	public function testGetPropPatch() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+		$this->expectExceptionMessage('apple-provisioning.mobileconfig\'s properties may not be altered.');
+
 		$propPatch = $this->createMock(PropPatch::class);
 
 		$this->node->propPatch($propPatch);
diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
index eeadf349710..e6d5b6217d0 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
@@ -59,7 +59,7 @@ class AppleProvisioningPluginTest extends TestCase {
 	/** @var AppleProvisioningPlugin */
 	protected $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->createMock(\Sabre\DAV\Server::class);
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
index 17bcf9fba97..3f201eba17e 100644
--- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
+++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -35,7 +35,7 @@ class CalDAVSettingsTest extends TestCase {
 	/** @var CalDAVSettings */
 	private $settings;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
index 926c652b77e..bd4afe9fb10 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
@@ -144,10 +144,10 @@ class SystemTagMappingNodeTest extends \Test\TestCase {
 		$this->assertInstanceOf($expectedException, $thrown);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testDeleteTagNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		// assuming the tag existed at the time the node was created,
 		// but got deleted concurrently in the database
 		$tag = new SystemTag(1, 'Test', true, true);
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
index d2bd59bff65..53df8c91969 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
@@ -81,10 +81,10 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->assertEquals($tag, $node->getSystemTag());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+
 		$this->getTagNode()->setName('2');
 	}
 
@@ -198,10 +198,10 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->assertInstanceOf($expectedException, $thrown);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Conflict
-	 */
+	
 	public function testUpdateTagAlreadyExists() {
+		$this->expectException(\Sabre\DAV\Exception\Conflict::class);
+
 		$tag = new SystemTag(1, 'tag1', true, true);
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
@@ -218,10 +218,10 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->getTagNode(false, $tag)->update('Renamed', true, true);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testUpdateTagNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$tag = new SystemTag(1, 'tag1', true, true);
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
@@ -286,10 +286,10 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->getTagNode(false, $tag)->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testDeleteTagNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$tag = new SystemTag(1, 'tag1', true, true);
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
index 1282807842a..8ac14ff6cbc 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
@@ -85,7 +85,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 	 */
 	private $plugin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->tree = $this->getMockBuilder(Tree::class)
 			->disableOriginalConstructor()
@@ -234,10 +234,10 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->assertEquals($expectedProperties, $result[200]);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testGetPropertiesForbidden() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$systemTag = new SystemTag(1, 'Test', true, false);
 		$requestedProperties = [
 			self::ID_PROPERTYNAME,
@@ -331,10 +331,10 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->assertEquals(200, $result[self::USERVISIBLE_PROPERTYNAME]);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testUpdatePropertiesForbidden() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$systemTag = new SystemTag(1, 'Test', true, false);
 		$this->user->expects($this->any())
 			->method('getUID')
@@ -385,10 +385,11 @@ class SystemTagPluginTest extends \Test\TestCase {
 	}
 	/**
 	 * @dataProvider createTagInsufficientPermissionsProvider
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Not sufficient permissions
 	 */
 	public function testCreateNotAssignableTagAsRegularUser($userVisible, $userAssignable, $groups) {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Not sufficient permissions');
+
 		$this->user->expects($this->once())
 			->method('getUID')
 			->willReturn('admin');
@@ -658,10 +659,10 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->plugin->httpPost($request, $response);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testCreateTagToUnknownNode() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$node = $this->getMockBuilder(SystemTagsObjectMappingCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -692,9 +693,10 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider nodeClassProvider
-	 * @expectedException \Sabre\DAV\Exception\Conflict
 	 */
 	public function testCreateTagConflict($nodeClass) {
+		$this->expectException(\Sabre\DAV\Exception\Conflict::class);
+
 		$this->user->expects($this->once())
 			->method('getUID')
 			->willReturn('admin');
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
index da46843a5b2..496caebc907 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
@@ -80,17 +80,17 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		return [[true], [false]];
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testForbiddenCreateFile() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->getNode()->createFile('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testForbiddenCreateDirectory() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->getNode()->createDirectory('789');
 	}
 
@@ -113,10 +113,10 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->assertEquals($tag, $childNode->getSystemTag());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testGetChildInvalidName() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['invalid'])
@@ -125,10 +125,10 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->getNode()->getChild('invalid');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['444'])
@@ -137,10 +137,10 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->getNode()->getChild('444');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildUserNotVisible() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$tag = new SystemTag(123, 'Test', false, false);
 
 		$this->tagManager->expects($this->once())
@@ -231,10 +231,10 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->assertFalse($this->getNode()->childExists('123'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testChildExistsBadRequest() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['invalid'])
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
index ff56ae3d447..7efe6b19c78 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
@@ -133,10 +133,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->assertInstanceOf($expectedException, $thrown);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\PreconditionFailed
-	 */
+	
 	public function testAssignTagNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\PreconditionFailed::class);
+
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
@@ -145,10 +145,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->getNode()->createFile('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testForbiddenCreateDirectory() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->getNode()->createDirectory('789');
 	}
 
@@ -175,10 +175,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->assertEquals('555', $childNode->getName());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildNonVisible() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$tag = new SystemTag(555, 'TheTag', false, false);
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
@@ -198,10 +198,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->getNode()->getChild('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildRelationNotFound() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '777')
@@ -210,10 +210,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->getNode()->getChild('777');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testGetChildInvalidId() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', 'badid')
@@ -222,10 +222,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->getNode()->getChild('badid');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildTagDoesNotExist() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '777')
@@ -326,10 +326,10 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->assertFalse($this->getNode()->childExists('555'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
+	
 	public function testChildExistsInvalidId() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555')
@@ -338,17 +338,17 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->getNode()->childExists('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->getNode()->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->getNode()->setName('somethingelse');
 	}
 
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
index 5e4e539b1e7..90b6e703a71 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
@@ -98,17 +98,17 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testForbiddenCreateFile() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->node->createFile('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testForbiddenCreateDirectory() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->node->createDirectory('789');
 	}
 
@@ -123,10 +123,10 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->assertEquals('555', $childNode->getName());
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
+	
 	public function testGetChildWithoutAccess() {
+		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
 		$this->userFolder->expects($this->once())
 			->method('getById')
 			->with('555')
@@ -134,10 +134,10 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->node->getChild('555');
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
-	 */
+	
 	public function testGetChildren() {
+		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
+
 		$this->node->getChildren();
 	}
 
@@ -157,17 +157,17 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->assertFalse($this->node->childExists('555'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->node->delete();
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$this->node->setName('somethingelse');
 	}
 
diff --git a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
index bc2b434bcf7..3135ced2612 100644
--- a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
+++ b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
@@ -51,7 +51,7 @@ class ChunkingPluginTest extends TestCase {
 	/** @var ResponseInterface | \PHPUnit_Framework_MockObject_MockObject */
 	private $response;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
@@ -141,11 +141,11 @@ class ChunkingPluginTest extends TestCase {
 		$this->assertFalse($this->plugin->beforeMove('source', 'target'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Chunks on server do not sum up to 4 but to 3 bytes
-	 */
+	
 	public function testBeforeMoveSizeIsWrong() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Chunks on server do not sum up to 4 but to 3 bytes');
+
 		$sourceNode = $this->createMock(FutureFile::class);
 		$sourceNode->expects($this->once())
 			->method('getSize')
diff --git a/apps/dav/tests/unit/Upload/FutureFileTest.php b/apps/dav/tests/unit/Upload/FutureFileTest.php
index 94be4ea66dd..cfe3491d13f 100644
--- a/apps/dav/tests/unit/Upload/FutureFileTest.php
+++ b/apps/dav/tests/unit/Upload/FutureFileTest.php
@@ -73,18 +73,18 @@ class FutureFileTest extends \Test\TestCase {
 		$f->delete();
 	}
 
-	/**
-	 * @expectedException Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testPut() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$f = $this->mockFutureFile();
 		$f->put('');
 	}
 
-	/**
-	 * @expectedException Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$f = $this->mockFutureFile();
 		$f->setName('');
 	}
diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php
index ef6bd9eec22..927cc1328df 100644
--- a/apps/encryption/tests/Command/TestEnableMasterKey.php
+++ b/apps/encryption/tests/Command/TestEnableMasterKey.php
@@ -53,7 +53,7 @@ class TestEnableMasterKey extends TestCase {
 	/** @var  \Symfony\Component\Console\Input\InputInterface | \PHPUnit_Framework_MockObject_MockObject */
 	protected $input;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->util = $this->getMockBuilder(Util::class)
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index 1731f25d532..053c4ce8f03 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -53,7 +53,7 @@ class CryptTest extends TestCase {
 	/** @var Crypt */
 	private $crypt;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->getMockBuilder(ILogger::class)
@@ -132,9 +132,10 @@ class CryptTest extends TestCase {
 	/**
 	 * test generateHeader with invalid key format
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testGenerateHeaderInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->crypt->generateHeader('unknown');
 	}
 
@@ -252,9 +253,10 @@ class CryptTest extends TestCase {
 
 	/**
 	 * @dataProvider dataTestHasSignatureFail
-	 * @expectedException \OCP\Encryption\Exceptions\GenericEncryptionException
 	 */
 	public function testHasSignatureFail($cipher) {
+		$this->expectException(\OCP\Encryption\Exceptions\GenericEncryptionException::class);
+
 		$data = 'encryptedContent00iv001234567890123456xx';
 		$this->invokePrivate($this->crypt, 'hasSignature', array($data, $cipher));
 	}
@@ -371,9 +373,10 @@ class CryptTest extends TestCase {
 	/**
 	 * test exception if cipher is unknown
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testGetKeySizeFailure() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->invokePrivate($this->crypt, 'getKeySize', ['foo']);
 	}
 
diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php
index b314bb5b543..1b94d1d96cf 100644
--- a/apps/encryption/tests/Crypto/DecryptAllTest.php
+++ b/apps/encryption/tests/Crypto/DecryptAllTest.php
@@ -53,7 +53,7 @@ class DecryptAllTest extends TestCase {
 	/** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject  */
 	protected $questionHelper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->util = $this->getMockBuilder(Util::class)
diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php
index f5f042aac66..f8be7210054 100644
--- a/apps/encryption/tests/Crypto/EncryptAllTest.php
+++ b/apps/encryption/tests/Crypto/EncryptAllTest.php
@@ -90,7 +90,7 @@ class EncryptAllTest extends TestCase {
 	/** @var  EncryptAll */
 	protected $encryptAll;
 
-	function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->setupUser = $this->getMockBuilder(Setup::class)
 			->disableOriginalConstructor()->getMock();
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index 4136673a6ec..94e0729317f 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -73,7 +73,7 @@ class EncryptionTest extends TestCase {
 	/** @var \OCP\Files\Storage|\PHPUnit_Framework_MockObject_MockObject */
 	private $storageMock;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->storageMock = $this->getMockBuilder(Storage::class)
@@ -131,9 +131,10 @@ class EncryptionTest extends TestCase {
 	/**
 	 * test if public key from owner is missing
 	 *
-	 * @expectedException \OCA\Encryption\Exceptions\PublicKeyMissingException
 	 */
 	public function testEndUser2() {
+		$this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class);
+
 		$this->instance->begin('/foo/bar', 'user2', 'r', array(), array('users' => array('user1', 'user2', 'user3')));
 		$this->endTest();
 	}
@@ -431,11 +432,11 @@ class EncryptionTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \OC\Encryption\Exceptions\DecryptionFailedException
-	 * @expectedExceptionMessage Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.
-	 */
+	
 	public function testDecrypt() {
+		$this->expectException(\OC\Encryption\Exceptions\DecryptionFailedException::class);
+		$this->expectExceptionMessage('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+
 		$this->instance->decrypt('abc');
 	}
 
diff --git a/apps/encryption/tests/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php
index 5ff76f918d4..39797942256 100644
--- a/apps/encryption/tests/HookManagerTest.php
+++ b/apps/encryption/tests/HookManagerTest.php
@@ -38,9 +38,7 @@ class HookManagerTest extends TestCase {
 	 */
 	private static $instance;
 
-	/**
-	 *
-	 */
+	
 	public function testRegisterHookWithArray() {
 		self::$instance->registerHook([
 			$this->getMockBuilder(IHook::class)->disableOriginalConstructor()->getMock(),
@@ -54,9 +52,7 @@ class HookManagerTest extends TestCase {
 	}
 
 
-	/**
-	 *
-	 */
+	
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 		// have to make instance static to preserve data between tests
@@ -64,9 +60,7 @@ class HookManagerTest extends TestCase {
 
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testRegisterHooksWithInstance() {
 		$mock = $this->getMockBuilder(IHook::class)->disableOriginalConstructor()->getMock();
 		/** @var \OCA\Encryption\Hooks\Contracts\IHook $mock */
diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index 6e5c51db3c8..fd2cac6461b 100644
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -79,7 +79,7 @@ class KeyManagerTest extends TestCase {
 	/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $configMock;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->userId = 'user1';
 		$this->systemKeyId = 'systemKeyId';
@@ -220,10 +220,10 @@ class KeyManagerTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
-	 */
+	
 	public function testUserHasKeysMissingPrivateKey() {
+		$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('getUserKey')
 			->willReturnCallback(function ($uid, $keyID, $encryptionModuleId) {
@@ -236,10 +236,10 @@ class KeyManagerTest extends TestCase {
 		$this->instance->userHasKeys($this->userId);
 	}
 
-	/**
-	 * @expectedException \OCA\Encryption\Exceptions\PublicKeyMissingException
-	 */
+	
 	public function testUserHasKeysMissingPublicKey() {
+		$this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class);
+
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('getUserKey')
 			->willReturnCallback(function ($uid, $keyID, $encryptionModuleId){
@@ -536,10 +536,10 @@ class KeyManagerTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testGetMasterKeyPasswordException() {
+		$this->expectException(\Exception::class);
+
 		$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
 			->willReturn('');
 
diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php
index 25c652b36af..5a0a65c77b3 100644
--- a/apps/encryption/tests/SessionTest.php
+++ b/apps/encryption/tests/SessionTest.php
@@ -41,11 +41,11 @@ class SessionTest extends TestCase {
 	/** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */
 	private $sessionMock;
 
-	/**
-	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
-	 * @expectedExceptionMessage Private Key missing for user: please try to log-out and log-in again
-	 */
+	
 	public function testThatGetPrivateKeyThrowsExceptionWhenNotSet() {
+		$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+		$this->expectExceptionMessage('Private Key missing for user: please try to log-out and log-in again');
+
 		$this->instance->getPrivateKey();
 	}
 
@@ -84,42 +84,44 @@ class SessionTest extends TestCase {
 	}
 
 	/**
-	 * @expectedException \Exception
 	 * @expectExceptionMessage 'Please activate decrypt all mode first'
 	 */
 	public function testGetDecryptAllUidException() {
+		$this->expectException(\Exception::class);
+
 		$this->instance->getDecryptAllUid();
 	}
 
 	/**
-	 * @expectedException \Exception
 	 * @expectExceptionMessage 'No uid found while in decrypt all mode'
 	 */
 	public function testGetDecryptAllUidException2() {
+		$this->expectException(\Exception::class);
+
 		$this->instance->prepareDecryptAll(null, 'key');
 		$this->instance->getDecryptAllUid();
 	}
 
 	/**
-	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
 	 * @expectExceptionMessage 'Please activate decrypt all mode first'
 	 */
 	public function testGetDecryptAllKeyException() {
+		$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+
 		$this->instance->getDecryptAllKey();
 	}
 
 	/**
-	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
 	 * @expectExceptionMessage 'No key found while in decrypt all mode'
 	 */
 	public function testGetDecryptAllKeyException2() {
+		$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+
 		$this->instance->prepareDecryptAll('user', null);
 		$this->instance->getDecryptAllKey();
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testSetAndGetStatusWillSetAndReturn() {
 		// Check if get status will return 0 if it has not been set before
 		$this->assertEquals(0, $this->instance->getStatus());
@@ -186,9 +188,7 @@ class SessionTest extends TestCase {
 		return null;
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testClearWillRemoveValues() {
 		$this->instance->setPrivateKey('privateKey');
 		$this->instance->setStatus('initStatus');
@@ -198,9 +198,7 @@ class SessionTest extends TestCase {
 		$this->assertEmpty(self::$tempStorage);
 	}
 
-	/**
-	 *
-	 */
+	
 	protected function setUp(): void {
 		parent::setUp();
 		$this->sessionMock = $this->createMock(ISession::class);
diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php
index 9df483916b7..8f68f06b6bd 100644
--- a/apps/encryption/tests/Settings/AdminTest.php
+++ b/apps/encryption/tests/Settings/AdminTest.php
@@ -50,7 +50,7 @@ class AdminTest extends TestCase {
 	/** @var ISession */
 	private $session;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l = $this->getMockBuilder(IL10N::class)->getMock();
diff --git a/apps/federatedfilesharing/tests/AddressHandlerTest.php b/apps/federatedfilesharing/tests/AddressHandlerTest.php
index efea34dbab2..e6ef4ddd7f3 100644
--- a/apps/federatedfilesharing/tests/AddressHandlerTest.php
+++ b/apps/federatedfilesharing/tests/AddressHandlerTest.php
@@ -46,7 +46,7 @@ class AddressHandlerTest extends \Test\TestCase {
 	/** @var CloudIdManager */
 	private $cloudIdManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)
@@ -125,9 +125,10 @@ class AddressHandlerTest extends \Test\TestCase {
 	 * @dataProvider dataTestSplitUserRemoteError
 	 *
 	 * @param string $id
-	 * @expectedException \OC\HintException
 	 */
 	public function testSplitUserRemoteError($id) {
+		$this->expectException(\OC\HintException::class);
+
 		$this->addressHandler->splitUserRemote($id);
 	}
 
diff --git a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
index 88f486f3c69..405d83cc91c 100644
--- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
@@ -84,7 +84,7 @@ class MountPublicLinkControllerTest extends \Test\TestCase {
 	/** @var  ICloudIdManager */
 	private $cloudIdManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)->disableOriginalConstructor()->getMock();
diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
index 31d13df8f31..1e0863fe1ce 100644
--- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
+++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -85,7 +85,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject|ICloudFederationProviderManager */
 	private $cloudFederationProviderManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -131,7 +131,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
 		$this->shareManager = \OC::$server->getShareManager();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->connection->getQueryBuilder()->delete('share')->execute();
 
 		parent::tearDown();
diff --git a/apps/federatedfilesharing/tests/NotificationsTest.php b/apps/federatedfilesharing/tests/NotificationsTest.php
index 769184f1628..abc8e9495bc 100644
--- a/apps/federatedfilesharing/tests/NotificationsTest.php
+++ b/apps/federatedfilesharing/tests/NotificationsTest.php
@@ -53,7 +53,7 @@ class NotificationsTest extends \Test\TestCase {
 	/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
 	private $cloudFederationFactory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = $this->getMockBuilder('OCP\BackgroundJob\IJobList')->getMock();
diff --git a/apps/federatedfilesharing/tests/Settings/AdminTest.php b/apps/federatedfilesharing/tests/Settings/AdminTest.php
index bca8ad73426..7eccf846f4b 100644
--- a/apps/federatedfilesharing/tests/Settings/AdminTest.php
+++ b/apps/federatedfilesharing/tests/Settings/AdminTest.php
@@ -38,7 +38,7 @@ class AdminTest extends TestCase {
 	/** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $gsConfig;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->federatedShareProvider = $this->createMock(FederatedShareProvider::class);
 		$this->gsConfig = $this->createMock(IConfig::class);
diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php
index bd3c0f92911..56039b1f801 100644
--- a/apps/federatedfilesharing/tests/TokenHandlerTest.php
+++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php
@@ -39,7 +39,7 @@ class TokenHandlerTest extends \Test\TestCase {
 	/** @var int */
 	private $expectedTokenLength = 15;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->secureRandom = $this->getMockBuilder(ISecureRandom::class)->getMock();
diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index b4e8365b502..c0d7c2f6b7d 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -81,7 +81,7 @@ class GetSharedSecretTest extends TestCase {
 	/** @var GetSharedSecret */
 	private $getSharedSecret;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->httpClientService = $this->createMock(IClientService::class);
diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index d97919942af..3eed5b89f7f 100644
--- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -73,7 +73,7 @@ class RequestSharedSecretTest extends TestCase {
 	/** @var  RequestSharedSecret */
 	private $requestSharedSecret;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->httpClientService = $this->createMock(IClientService::class);
diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index c625d960e5a..d862faeae1b 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -67,7 +67,7 @@ class OCSAuthAPIControllerTest extends TestCase {
 	/** @var int simulated timestamp */
 	private $currentTime = 1234567;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index 9b283b50903..2aa2a454f66 100644
--- a/apps/federation/tests/Controller/SettingsControllerTest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
@@ -45,7 +45,7 @@ class SettingsControllerTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Federation\TrustedServers */
 	private $trustedServers;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
@@ -84,12 +84,13 @@ class SettingsControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider checkServerFails
-	 * @expectedException \OC\HintException
 	 *
 	 * @param bool $isTrustedServer
 	 * @param bool $isOwnCloud
 	 */
 	public function testAddServerFail($isTrustedServer, $isOwnCloud) {
+		$this->expectException(\OC\HintException::class);
+
 		$this->trustedServers
 			->expects($this->any())
 			->method('isTrustedServer')
@@ -132,12 +133,13 @@ class SettingsControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider checkServerFails
-	 * @expectedException \OC\HintException
 	 *
 	 * @param bool $isTrustedServer
 	 * @param bool $isOwnCloud
 	 */
 	public function testCheckServerFail($isTrustedServer, $isOwnCloud) {
+		$this->expectException(\OC\HintException::class);
+
 		$this->trustedServers
 			->expects($this->any())
 			->method('isTrustedServer')
diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php
index 348f5b70308..8d1eaa0ebc3 100644
--- a/apps/federation/tests/DbHandlerTest.php
+++ b/apps/federation/tests/DbHandlerTest.php
@@ -49,7 +49,7 @@ class DbHandlerTest extends TestCase {
 	/** @var string  */
 	private $dbTable = 'trusted_servers';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -65,7 +65,7 @@ class DbHandlerTest extends TestCase {
 		$this->assertEmpty($result, 'we need to start with a empty trusted_servers table');
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		$query = $this->connection->getQueryBuilder()->delete($this->dbTable);
 		$query->execute();
diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
index ad6e0bf8a77..027db171990 100644
--- a/apps/federation/tests/HooksTest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -36,7 +36,7 @@ class HooksTest extends TestCase {
 	/** @var  Hooks */
 	private $hooks;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index 4423233b93e..1557fb08330 100644
--- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
@@ -48,7 +48,7 @@ class AddServerMiddlewareTest extends TestCase {
 	/** @var  \PHPUnit_Framework_MockObject_MockObject | SettingsController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->getMockBuilder(ILogger::class)->getMock();
diff --git a/apps/federation/tests/Settings/AdminTest.php b/apps/federation/tests/Settings/AdminTest.php
index 0fc1f7c25ab..ed7c049cc44 100644
--- a/apps/federation/tests/Settings/AdminTest.php
+++ b/apps/federation/tests/Settings/AdminTest.php
@@ -34,7 +34,7 @@ class AdminTest extends TestCase {
 	/** @var TrustedServers */
 	private $trustedServers;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->trustedServers = $this->getMockBuilder('\OCA\Federation\TrustedServers')->disableOriginalConstructor()->getMock();
 		$this->admin = new Admin(
diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php
index e1c810bde97..09b567e9435 100644
--- a/apps/federation/tests/SyncFederationAddressbooksTest.php
+++ b/apps/federation/tests/SyncFederationAddressbooksTest.php
@@ -38,7 +38,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
 	/** @var  \PHPUnit_Framework_MockObject_MockObject | DiscoveryService */
 	private $discoveryService;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->discoveryService = $this->getMockBuilder(DiscoveryService::class)
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index 82e5654e63f..2b1f8174e09 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -76,7 +76,7 @@ class TrustedServersTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
 	private $timeFactory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->dbHandler = $this->getMockBuilder(DbHandler::class)
@@ -352,10 +352,11 @@ class TrustedServersTest extends TestCase {
 
 	/**
 	 * @dataProvider dataTestCheckOwnCloudVersionTooLow
-	 * @expectedException \OC\HintException
-	 * @expectedExceptionMessage Remote server version is too low. 9.0 is required.
 	 */
 	public function testCheckOwnCloudVersionTooLow($status) {
+		$this->expectException(\OC\HintException::class);
+		$this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
+
 		$this->invokePrivate($this->trustedServers, 'checkOwnCloudVersion', [$status]);
 	}
 
diff --git a/apps/files/tests/Activity/Filter/GenericTest.php b/apps/files/tests/Activity/Filter/GenericTest.php
index f2b1acba3b3..8cae50c99c9 100644
--- a/apps/files/tests/Activity/Filter/GenericTest.php
+++ b/apps/files/tests/Activity/Filter/GenericTest.php
@@ -60,7 +60,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIdentifier());
+		$this->assertIsString($filter->getIdentifier());
 	}
 
 	/**
@@ -70,7 +70,7 @@ class GenericTest extends TestCase {
 	public function testGetName($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getName());
+		$this->assertIsString($filter->getName());
 	}
 
 	/**
@@ -81,7 +81,7 @@ class GenericTest extends TestCase {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
 		$priority = $filter->getPriority();
-		$this->assertInternalType('int', $filter->getPriority());
+		$this->assertIsInt($filter->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -93,7 +93,7 @@ class GenericTest extends TestCase {
 	public function testGetIcon($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIcon());
+		$this->assertIsString($filter->getIcon());
 		$this->assertStringStartsWith('http', $filter->getIcon());
 	}
 
@@ -104,7 +104,7 @@ class GenericTest extends TestCase {
 	public function testFilterTypes($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->filterTypes([]));
+		$this->assertIsArray($filter->filterTypes([]));
 	}
 
 	/**
@@ -114,6 +114,6 @@ class GenericTest extends TestCase {
 	public function testAllowedApps($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->allowedApps());
+		$this->assertIsArray($filter->allowedApps());
 	}
 }
diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php
index da1f014ad05..cb8a2175307 100644
--- a/apps/files/tests/Activity/ProviderTest.php
+++ b/apps/files/tests/Activity/ProviderTest.php
@@ -55,7 +55,7 @@ class ProviderTest extends TestCase {
 	/** @var IEventMerger|\PHPUnit_Framework_MockObject_MockObject */
 	protected $eventMerger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l10nFactory = $this->createMock(IFactory::class);
@@ -136,10 +136,10 @@ class ProviderTest extends TestCase {
 		$this->assertSame('link-' . $id, $result['link']);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetFileThrows() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$provider = $this->getProvider();
 		self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
 	}
diff --git a/apps/files/tests/Activity/Setting/GenericTest.php b/apps/files/tests/Activity/Setting/GenericTest.php
index a8df291cb80..e93919ffd4d 100644
--- a/apps/files/tests/Activity/Setting/GenericTest.php
+++ b/apps/files/tests/Activity/Setting/GenericTest.php
@@ -61,7 +61,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getIdentifier());
+		$this->assertIsString($setting->getIdentifier());
 	}
 
 	/**
@@ -71,7 +71,7 @@ class GenericTest extends TestCase {
 	public function testGetName($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getName());
+		$this->assertIsString($setting->getName());
 	}
 
 	/**
@@ -82,7 +82,7 @@ class GenericTest extends TestCase {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
 		$priority = $setting->getPriority();
-		$this->assertInternalType('int', $setting->getPriority());
+		$this->assertIsInt($setting->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -94,7 +94,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeStream());
+		$this->assertIsBool($setting->canChangeStream());
 	}
 
 	/**
@@ -104,7 +104,7 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledStream());
+		$this->assertIsBool($setting->isDefaultEnabledStream());
 	}
 
 	/**
@@ -114,7 +114,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeMail());
+		$this->assertIsBool($setting->canChangeMail());
 	}
 
 	/**
@@ -124,6 +124,6 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledMail());
+		$this->assertIsBool($setting->isDefaultEnabledMail());
 	}
 }
diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php
index 8539c6ba7d3..f4110cfbad0 100644
--- a/apps/files/tests/BackgroundJob/ScanFilesTest.php
+++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php
@@ -42,7 +42,7 @@ class ScanFilesTest extends TestCase {
 	/** @var ScanFiles */
 	private $scanFiles;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php
index e5fbe7d3868..bd27fc2537d 100644
--- a/apps/files/tests/Controller/ApiControllerTest.php
+++ b/apps/files/tests/Controller/ApiControllerTest.php
@@ -68,7 +68,7 @@ class ApiControllerTest extends TestCase {
 	/** @var Folder|\PHPUnit_Framework_MockObject_MockObject */
 	private $userFolder;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index c57be81b487..0e109128c5b 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -76,7 +76,7 @@ class ViewControllerTest extends TestCase {
 	/** @var Helper|\PHPUnit_Framework_MockObject_MockObject */
 	private $activityHelper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
 		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
diff --git a/apps/files_external/tests/Auth/Password/GlobalAuth.php b/apps/files_external/tests/Auth/Password/GlobalAuth.php
index 15f8f5f47a9..7c28f1b3f53 100644
--- a/apps/files_external/tests/Auth/Password/GlobalAuth.php
+++ b/apps/files_external/tests/Auth/Password/GlobalAuth.php
@@ -105,10 +105,10 @@ class GlobalAuthTest extends TestCase {
 		], $storage->getBackendOptions());
 	}
 
-	/**
-	 * @expectedException \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException
-	 */
+	
 	public function testNoCredentialsPersonal() {
+		$this->expectException(\OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException::class);
+
 		$this->credentialsManager->expects($this->never())
 			->method('retrieve');
 
diff --git a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
index 006bb458370..ba064b8fb6f 100644
--- a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
+++ b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
@@ -50,7 +50,7 @@ class UserPlaceholderHandlerTest extends \Test\TestCase {
 	/** @var UserPlaceholderHandler */
 	protected $handler;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->user = $this->createMock(IUser::class);
diff --git a/apps/files_external/tests/Controller/AjaxControllerTest.php b/apps/files_external/tests/Controller/AjaxControllerTest.php
index a940f49fc2a..6bb9c3418ee 100644
--- a/apps/files_external/tests/Controller/AjaxControllerTest.php
+++ b/apps/files_external/tests/Controller/AjaxControllerTest.php
@@ -48,7 +48,7 @@ class AjaxControllerTest extends TestCase {
 	/** @var AjaxController */
 	private $ajaxController;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->request = $this->createMock(IRequest::class);
 		$this->rsa = $this->getMockBuilder('\\OCA\\Files_External\\Lib\\Auth\\PublicKey\\RSA')
 			->disableOriginalConstructor()
diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
index bcc8d3e2d98..458714e463a 100644
--- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
@@ -34,7 +34,7 @@ use OCP\ILogger;
 use OCP\IRequest;
 
 class GlobalStoragesControllerTest extends StoragesControllerTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->service = $this->getMockBuilder('\OCA\Files_External\Service\GlobalStoragesService')
 			->disableOriginalConstructor()
diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php
index 184b7a6c699..d865b3e8d0f 100644
--- a/apps/files_external/tests/Controller/StoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -46,11 +46,11 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 	 */
 	protected $service;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		\OC_Mount_Config::$skipTest = true;
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		\OC_Mount_Config::$skipTest = false;
 	}
 
diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
index ddd6d01717e..f130af7c76f 100644
--- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
@@ -42,7 +42,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	 */
 	private $oldAllowedBackends;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->service = $this->getMockBuilder('\OCA\Files_External\Service\UserStoragesService')
 			->disableOriginalConstructor()
diff --git a/apps/files_external/tests/Service/BackendServiceTest.php b/apps/files_external/tests/Service/BackendServiceTest.php
index 8cd1e680dea..526098dc2b4 100644
--- a/apps/files_external/tests/Service/BackendServiceTest.php
+++ b/apps/files_external/tests/Service/BackendServiceTest.php
@@ -234,9 +234,10 @@ class BackendServiceTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider invalidConfigPlaceholderProvider
-	 * @expectedException \RuntimeException
 	 */
 	public function testRegisterConfigHandlerInvalid(array $placeholders) {
+		$this->expectException(\RuntimeException::class);
+
 		$service = new BackendService($this->config);
 		$mock = $this->createMock(IConfigHandler::class);
 		$cb = function () use ($mock) { return $mock; };
diff --git a/apps/files_external/tests/Service/DBConfigServiceTest.php b/apps/files_external/tests/Service/DBConfigServiceTest.php
index 375f1e7018a..7a04a8f61b7 100644
--- a/apps/files_external/tests/Service/DBConfigServiceTest.php
+++ b/apps/files_external/tests/Service/DBConfigServiceTest.php
@@ -44,13 +44,13 @@ class DBConfigServiceTest extends TestCase {
 
 	private $mounts = [];
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->dbConfig = new DBConfigService($this->connection, \OC::$server->getCrypto());
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		foreach ($this->mounts as $mount) {
 			$this->dbConfig->removeMount($mount);
 		}
diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
index c4d1055521a..37ae71696f0 100644
--- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
@@ -33,12 +33,12 @@ use OCA\Files_External\Service\GlobalStoragesService;
  * @group DB
  */
 class GlobalStoragesServiceTest extends StoragesServiceTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->service = new GlobalStoragesService($this->backendService, $this->dbConfig, $this->mountCache);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		@unlink($this->dataDir . '/mount.json');
 		parent::tearDown();
 	}
@@ -471,8 +471,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 		}
 	}
 
-	/**
-	 */
+	
 	public function testHooksRenameMountPoint() {
 		$storage = $this->makeTestStorageData();
 		$storage->setApplicableUsers(['user1', 'user2']);
diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php
index 4e2b73f2612..140bbdc772b 100644
--- a/apps/files_external/tests/Service/StoragesServiceTest.php
+++ b/apps/files_external/tests/Service/StoragesServiceTest.php
@@ -92,7 +92,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 	 */
 	protected $mountCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->dbConfig = new CleaningDBConfig(\OC::$server->getDatabaseConnection(), \OC::$server->getCrypto());
 		self::$hookCalls = array();
@@ -175,7 +175,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 			->willReturn($containerMock);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		\OC_Mount_Config::$skipTest = false;
 		self::$hookCalls = array();
 		if ($this->dbConfig) {
@@ -252,10 +252,10 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCA\Files_External\NotFoundException
-	 */
+	
 	public function testNonExistingStorage() {
+		$this->expectException(\OCA\Files_External\NotFoundException::class);
+
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 		$storage = new StorageConfig(255);
@@ -334,10 +334,10 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		$this->assertCount($expectedCountAfterDeletion, $storages, "expected $expectedCountAfterDeletion storages, got " . json_encode($storages));
 	}
 
-	/**
-	 * @expectedException \OCA\Files_External\NotFoundException
-	 */
+	
 	public function testDeleteUnexistingStorage() {
+		$this->expectException(\OCA\Files_External\NotFoundException::class);
+
 		$this->service->removeStorage(255);
 	}
 
diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
index 9a6100d8075..83a0d9c7fd7 100644
--- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -60,7 +60,7 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 	const GROUP_ID = 'test_group';
 	const GROUP_ID2 = 'test_group2';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->globalStoragesService = $this->service;
@@ -158,10 +158,10 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 
 	}
 
-	/**
-	 * @expectedException \DomainException
-	 */
+	
 	public function testAddStorage($storageParams = null) {
+		$this->expectException(\DomainException::class);
+
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 
@@ -174,10 +174,10 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->service->addStorage($storage);
 	}
 
-	/**
-	 * @expectedException \DomainException
-	 */
+	
 	public function testUpdateStorage($storageParams = null) {
+		$this->expectException(\DomainException::class);
+
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 
@@ -194,18 +194,19 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->service->updateStorage($retrievedStorage);
 	}
 
-	/**
-	 * @expectedException \DomainException
-	 */
+	
 	public function testNonExistingStorage() {
+		$this->expectException(\DomainException::class);
+
 		parent::testNonExistingStorage();
 	}
 
 	/**
-	 * @expectedException \DomainException
 	 * @dataProvider deleteStorageDataProvider
 	 */
 	public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) {
+		$this->expectException(\DomainException::class);
+
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 
@@ -221,10 +222,10 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->service->removeStorage($id);
 	}
 
-	/**
-	 * @expectedException \DomainException
-	 */
+	
 	public function testDeleteUnexistingStorage() {
+		$this->expectException(\DomainException::class);
+
 		parent::testDeleteUnexistingStorage();
 	}
 
diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php
index ce0b3ab65b1..7b9d16211e0 100644
--- a/apps/files_external/tests/Service/UserStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php
@@ -50,7 +50,7 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 	 */
 	protected $globalStoragesService;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->globalStoragesService = new GlobalStoragesService($this->backendService, $this->dbConfig, $this->mountCache);
@@ -189,10 +189,10 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 		);
 	}
 
-	/**
-	 * @expectedException \OCA\Files_External\NotFoundException
-	 */
+	
 	public function testGetAdminStorage() {
+		$this->expectException(\OCA\Files_External\NotFoundException::class);
+
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 
diff --git a/apps/files_external/tests/Settings/AdminTest.php b/apps/files_external/tests/Settings/AdminTest.php
index 3889fe456e4..1d24cbbde10 100644
--- a/apps/files_external/tests/Settings/AdminTest.php
+++ b/apps/files_external/tests/Settings/AdminTest.php
@@ -43,7 +43,7 @@ class AdminTest extends TestCase {
 	/** @var GlobalAuth|\PHPUnit_Framework_MockObject_MockObject */
 	private $globalAuth;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->encryptionManager = $this->createMock(IManager::class);
 		$this->globalStoragesService = $this->createMock(GlobalStoragesService::class);
diff --git a/apps/files_external/tests/Settings/SectionTest.php b/apps/files_external/tests/Settings/SectionTest.php
index 3a8a4f5f780..b9ce3e3aa9a 100644
--- a/apps/files_external/tests/Settings/SectionTest.php
+++ b/apps/files_external/tests/Settings/SectionTest.php
@@ -37,7 +37,7 @@ class SectionTest extends TestCase {
 	/** @var Section */
 	private $section;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->disableOriginalConstructor()->getMock();
 		$this->l = $this->getMockBuilder(IL10N::class)->disableOriginalConstructor()->getMock();
diff --git a/apps/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php
index fe40c0fbd95..4e8e6431a72 100644
--- a/apps/files_external/tests/Storage/SFTP_KeyTest.php
+++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php
@@ -60,10 +60,10 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testInvalidAddressShouldThrowException() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		// I'd use example.com for this, but someone decided to break the spec and make it resolve
 		$this->instance->assertHostAddressValid('notarealaddress...');
 	}
@@ -72,24 +72,24 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
 		$this->assertTrue($this->instance->assertHostAddressValid('localhost'));
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testNegativePortNumberShouldThrowException() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->instance->assertPortNumberValid('-1');
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
+	
 	public function testNonNumericalPortNumberShouldThrowException() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->instance->assertPortNumberValid('a');
 	}
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
-	public function testHighPortNumberShouldThrowException() { 
+	
+	public function testHighPortNumberShouldThrowException() {
+		$this->expectException(\InvalidArgumentException::class);
+ 
 		$this->instance->assertPortNumberValid('65536');
 	}
 
diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php
index 493f607dba2..3f8dd85c10b 100644
--- a/apps/files_sharing/tests/CapabilitiesTest.php
+++ b/apps/files_sharing/tests/CapabilitiesTest.php
@@ -92,7 +92,7 @@ class CapabilitiesTest extends \Test\TestCase {
 			['core', 'shareapi_allow_links', 'yes', 'no'],
 		];
 		$result = $this->getResults($map);
-		$this->assertInternalType('array', $result['public']);
+		$this->assertIsArray($result['public']);
 		$this->assertFalse($result['public']['enabled']);
 	}
 
@@ -102,7 +102,7 @@ class CapabilitiesTest extends \Test\TestCase {
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 		];
 		$result = $this->getResults($map);
-		$this->assertInternalType('array', $result['public']);
+		$this->assertIsArray($result['public']);
 		$this->assertTrue($result['public']['enabled']);
 	}
 
@@ -138,7 +138,7 @@ class CapabilitiesTest extends \Test\TestCase {
 		];
 		$result = $this->getResults($map);
 		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertInternalType('array', $result['public']['expire_date']);
+		$this->assertIsArray($result['public']['expire_date']);
 		$this->assertFalse($result['public']['expire_date']['enabled']);
 	}
 
@@ -152,7 +152,7 @@ class CapabilitiesTest extends \Test\TestCase {
 		];
 		$result = $this->getResults($map);
 		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertInternalType('array', $result['public']['expire_date']);
+		$this->assertIsArray($result['public']['expire_date']);
 		$this->assertTrue($result['public']['expire_date']['enabled']);
 		$this->assertArrayHasKey('days', $result['public']['expire_date']);
 		$this->assertFalse($result['public']['expire_date']['enforced']);
@@ -167,7 +167,7 @@ class CapabilitiesTest extends \Test\TestCase {
 		];
 		$result = $this->getResults($map);
 		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertInternalType('array', $result['public']['expire_date']);
+		$this->assertIsArray($result['public']['expire_date']);
 		$this->assertTrue($result['public']['expire_date']['enforced']);
 	}
 
diff --git a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
index 93bef4afbf6..146bb565a81 100644
--- a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
+++ b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
@@ -43,7 +43,7 @@ class ShareRecipientSorterTest extends TestCase {
 	/** @var  ShareRecipientSorter */
 	protected $sorter;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = $this->createMock(IManager::class);
diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
index 4e100cf2099..102210e3b1e 100644
--- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
+++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
@@ -110,7 +110,7 @@ class CleanupRemoteStoragesTest extends TestCase {
 		$this->command = new CleanupRemoteStorages($this->connection);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$storageQuery = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$storageQuery->delete('storages')
 			->where($storageQuery->expr()->eq('id', $storageQuery->createParameter('id')));
diff --git a/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
index d2237acbd7f..5296a1ad0c3 100644
--- a/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
@@ -43,7 +43,7 @@ class ExternalShareControllerTest extends \Test\TestCase {
 	/** @var IClientService */
 	private $clientService;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->request = $this->getMockBuilder('\\OCP\\IRequest')
 			->disableOriginalConstructor()->getMock();
diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
index cbe3872bb67..834796bf431 100644
--- a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
+++ b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
@@ -54,7 +54,7 @@ class PublicPreviewControllerTest extends TestCase {
 	/** @var PublicPreviewController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->previewManager = $this->createMock(IPreview::class);
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index 7a50a752044..ae7fc54599c 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -164,11 +164,11 @@ class ShareAPIControllerTest extends TestCase {
 		return \OC::$server->getShareManager()->newShare();
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Wrong share ID, share doesn't exist
-	 */
+	
 	public function testDeleteShareShareNotFound() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+
 		$this->shareManager
 			->expects($this->exactly(3))
 			->method('getShareById')
@@ -212,11 +212,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Could not delete share
-	 */
+	
 	public function testDeleteShareLocked() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Could not delete share');
+
 		$node = $this->getMockBuilder(File::class)->getMock();
 
 		$share = $this->newShare();
@@ -401,10 +401,11 @@ class ShareAPIControllerTest extends TestCase {
 	/**
 	 * You cannot remove a share if you're not
 	 * in the group the share is shared with
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Wrong share ID, share doesn't exist
 	 */
 	public function testDeleteSharedWithGroupIDontBelongTo() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+
 		$node = $this->getMockBuilder(File::class)->getMock();
 
 		$share = $this->newShare();
@@ -767,11 +768,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($result, $ocs->getShare($share->getId())->getData()[0]);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Wrong share ID, share doesn't exist
-	 */
+	
 	public function testGetShareInvalidNode() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+
 		$share = \OC::$server->getShareManager()->newShare();
 		$share->setSharedBy('initiator')
 			->setSharedWith('recipient')
@@ -1533,19 +1534,19 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Please specify a file or folder path
-	 */
+	
 	public function testCreateShareNoPath() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Please specify a file or folder path');
+
 		$this->ocs->createShare();
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Wrong path, file/folder doesn't exist
-	 */
+	
 	public function testCreateShareInvalidPath() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Wrong path, file/folder doesn\'t exist');
+
 		$userFolder = $this->getMockBuilder(Folder::class)->getMock();
 		$this->rootFolder->expects($this->once())
 			->method('getUserFolder')
@@ -1560,11 +1561,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('invalid-path');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage invalid permissions
-	 */
+	
 	public function testCreateShareInvalidPermissions() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('invalid permissions');
+
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
 
@@ -1587,11 +1588,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('valid-path', 32);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Please specify a valid user
-	 */
+	
 	public function testCreateShareUserNoShareWith() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Please specify a valid user');
+
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
 
@@ -1619,11 +1620,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_USER);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Please specify a valid user
-	 */
+	
 	public function testCreateShareUserNoValidShareWith() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Please specify a valid user');
+
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
 
@@ -1719,11 +1720,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Please specify a valid group
-	 */
+	
 	public function testCreateShareGroupNoValidShareWith() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Please specify a valid group');
+
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
 		$this->shareManager->method('createShare')->will($this->returnArgument(0));
@@ -1828,11 +1829,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Group sharing is disabled by the administrator
-	 */
+	
 	public function testCreateShareGroupNotAllowed() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Group sharing is disabled by the administrator');
+
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
 
@@ -1862,11 +1863,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_GROUP, 'invalidGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Public link sharing is disabled by the administrator
-	 */
+	
 	public function testCreateShareLinkNoLinksAllowed() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Public link sharing is disabled by the administrator');
+
 		$this->request
 			->method('getParam')
 			->will($this->returnValueMap([
@@ -1888,11 +1889,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSForbiddenException
-	 * @expectedExceptionMessage Public upload disabled by the administrator
-	 */
+	
 	public function testCreateShareLinkNoPublicUpload() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class);
+		$this->expectExceptionMessage('Public upload disabled by the administrator');
+
 		$path = $this->getMockBuilder(Folder::class)->getMock();
 		$storage = $this->createMock(Storage::class);
 		$storage->method('instanceOfStorage')
@@ -1908,11 +1909,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'true');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Public upload is only possible for publicly shared folders
-	 */
+	
 	public function testCreateShareLinkPublicUploadFile() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Public upload is only possible for publicly shared folders');
+
 		$path = $this->getMockBuilder(File::class)->getMock();
 		$storage = $this->createMock(Storage::class);
 		$storage->method('instanceOfStorage')
@@ -2034,11 +2035,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSForbiddenException
-	 * @expectedExceptionMessage Sharing valid-path sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled
-     */
+	
 	public function testCreateShareLinkSendPasswordByTalkWithTalkDisabled() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class);
+		$this->expectExceptionMessage('Sharing valid-path sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled');
+
 		$ocs = $this->mockFormatShare();
 
 		$path = $this->getMockBuilder(Folder::class)->getMock();
@@ -2109,11 +2110,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Invalid date, date format must be YYYY-MM-DD
-	 */
+	
 	public function testCreateShareInvalidExpireDate() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Invalid date, date format must be YYYY-MM-DD');
+
 		$ocs = $this->mockFormatShare();
 
 		$path = $this->getMockBuilder(Folder::class)->getMock();
@@ -2210,11 +2211,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSForbiddenException
-	 * @expectedExceptionMessage Sharing valid-path failed because the back end does not support room shares
-	 */
+	
 	public function testCreateShareRoomHelperNotAvailable() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class);
+		$this->expectExceptionMessage('Sharing valid-path failed because the back end does not support room shares');
+
 		$ocs = $this->mockFormatShare();
 
 		$share = $this->newShare();
@@ -2251,11 +2252,11 @@ class ShareAPIControllerTest extends TestCase {
 		$ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_ROOM, 'recipientRoom');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Exception thrown by the helper
-	 */
+	
 	public function testCreateShareRoomHelperThrowException() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Exception thrown by the helper');
+
 		$ocs = $this->mockFormatShare();
 
 		$share = $this->newShare();
@@ -2369,11 +2370,11 @@ class ShareAPIControllerTest extends TestCase {
 		$ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_USER, 'validUser');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSNotFoundException
-	 * @expectedExceptionMessage Wrong share ID, share doesn't exist
-	 */
+	
 	public function testUpdateShareCantAccess() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
+		$this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
+
 		$node = $this->getMockBuilder(Folder::class)->getMock();
 		$share = $this->newShare();
 		$share->setNode($node);
@@ -2396,11 +2397,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->updateShare(42);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
-	 * @expectedExceptionMessage Wrong or no update parameter given
-	 */
+	
 	public function testUpdateNoParametersLink() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSBadRequestException::class);
+		$this->expectExceptionMessage('Wrong or no update parameter given');
+
 		$node = $this->getMockBuilder(Folder::class)->getMock();
 		$share = $this->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
@@ -2417,11 +2418,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->ocs->updateShare(42);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
-	 * @expectedExceptionMessage Wrong or no update parameter given
-	 */
+	
 	public function testUpdateNoParametersOther() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSBadRequestException::class);
+		$this->expectExceptionMessage('Wrong or no update parameter given');
+
 		$node = $this->getMockBuilder(Folder::class)->getMock();
 		$share = $this->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
@@ -2606,11 +2607,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
-	 * @expectedExceptionMessage Invalid date. Format must be YYYY-MM-DD
-	 */
+	
 	public function testUpdateLinkShareInvalidDate() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSBadRequestException::class);
+		$this->expectExceptionMessage('Invalid date. Format must be YYYY-MM-DD');
+
 		$ocs = $this->mockFormatShare();
 
 		$folder = $this->getMockBuilder(Folder::class)->getMock();
@@ -2645,10 +2646,11 @@ class ShareAPIControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider publicUploadParamsProvider
-	 * @expectedException \OCP\AppFramework\OCS\OCSForbiddenException
-	 * @expectedExceptionMessage Public upload disabled by the administrator
 	 */
 	public function testUpdateLinkSharePublicUploadNotAllowed($permissions, $publicUpload, $expireDate, $password) {
+		$this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class);
+		$this->expectExceptionMessage('Public upload disabled by the administrator');
+
 		$ocs = $this->mockFormatShare();
 
 		$folder = $this->getMockBuilder(Folder::class)->getMock();
@@ -2665,11 +2667,11 @@ class ShareAPIControllerTest extends TestCase {
 		$ocs->updateShare(42, $permissions, $password, null, $publicUpload, $expireDate);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
-	 * @expectedExceptionMessage Public upload is only possible for publicly shared folders
-	 */
+	
 	public function testUpdateLinkSharePublicUploadOnFile() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSBadRequestException::class);
+		$this->expectExceptionMessage('Public upload is only possible for publicly shared folders');
+
 		$ocs = $this->mockFormatShare();
 
 		$file = $this->getMockBuilder(File::class)->getMock();
@@ -2778,11 +2780,11 @@ class ShareAPIControllerTest extends TestCase {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSForbiddenException
-	 * @expectedExceptionMessage Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled
-     */
+	
 	public function testUpdateLinkShareSendPasswordByTalkWithTalkDisabledDoesNotChangeOther() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSForbiddenException::class);
+		$this->expectExceptionMessage('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled');
+
 		$ocs = $this->mockFormatShare();
 
 		$date = new \DateTime('2000-01-01');
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index ec6fc9a598d..55981f00238 100644
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -532,10 +532,10 @@ class ShareControllerTest extends \Test\TestCase {
 		self::assertEquals($expectedResponse, $response);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testShowShareInvalid() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$this->shareController->setToken('token');
 
 		$owner = $this->getMockBuilder(IUser::class)->getMock();
diff --git a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
index b8d87d5cd68..f2feb6e7fcc 100644
--- a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
@@ -45,7 +45,7 @@ class ShareInfoControllerTest extends TestCase {
 	private $shareManager;
 
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = $this->createMock(ShareManager::class);
diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
index 20790fc0bfa..99f86525913 100644
--- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
@@ -397,11 +397,11 @@ class ShareesAPIControllerTest extends TestCase {
 		$this->assertSame($expected, $this->invokePrivate($this->sharees, 'isRemoteSharingAllowed', [$itemType]));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
-	 * @expectedExceptionMessage Missing itemType
-	 */
+	
 	public function testSearchNoItemType() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSBadRequestException::class);
+		$this->expectExceptionMessage('Missing itemType');
+
 		$this->sharees->search('', null, 1, 10, [], false);
 	}
 
diff --git a/apps/files_sharing/tests/LockingTest.php b/apps/files_sharing/tests/LockingTest.php
index 47394fc588f..49f49da643f 100644
--- a/apps/files_sharing/tests/LockingTest.php
+++ b/apps/files_sharing/tests/LockingTest.php
@@ -46,7 +46,7 @@ class LockingTest extends TestCase {
 	private $ownerUid;
 	private $recipientUid;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userBackend = new \Test\Util\User\Dummy();
@@ -74,15 +74,15 @@ class LockingTest extends TestCase {
 		$this->assertTrue(Filesystem::file_exists('bar.txt'));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		\OC::$server->getUserManager()->removeBackend($this->userBackend);
 		parent::tearDown();
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testLockAsRecipient() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->loginAsUser($this->ownerUid);
 
 		Filesystem::initMountPoints($this->recipientUid);
diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
index 06d33859a28..31ca88cc4fc 100644
--- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
@@ -44,7 +44,7 @@ class OCSShareAPIMiddlewareTest extends \Test\TestCase {
 	/** @var OCSShareAPIMiddleware */
 	private $middleware;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = $this->createMock(IManager::class);
diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
index e6744d5fd1d..db698d94f11 100644
--- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
@@ -41,7 +41,7 @@ class ShareInfoMiddlewareTest extends TestCase {
 	/** @var ShareInfoMiddleware */
 	private $middleware;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = $this->createMock(ShareManager::class);
diff --git a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
index e3fb602acd6..7a2baba16e0 100644
--- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
@@ -198,11 +198,11 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 * @expectedExceptionMessage Sharing is disabled.
-	 */
+	
 	public function testBeforeControllerWithSharingDisabled() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+		$this->expectExceptionMessage('Sharing is disabled.');
+
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
@@ -212,11 +212,11 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage My Exception message
-	 */
+	
 	public function testAfterExceptionWithRegularException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('My Exception message');
+
 		$this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new \Exception('My Exception message'));
 	}
 
diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
index 418ede9179a..b98b0b9fcd8 100644
--- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
+++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
@@ -47,7 +47,7 @@ class SetPasswordColumnTest extends TestCase {
 
 	private $table = 'share';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -57,7 +57,7 @@ class SetPasswordColumnTest extends TestCase {
 		$this->cleanDB();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		$this->cleanDB();
 	}
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index 5b20524da47..06ca2060477 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -59,7 +59,7 @@ class MountProviderTest extends \Test\TestCase {
 	/** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
diff --git a/apps/files_trashbin/tests/CapabilitiesTest.php b/apps/files_trashbin/tests/CapabilitiesTest.php
index 9a891e86522..c600617fcf3 100644
--- a/apps/files_trashbin/tests/CapabilitiesTest.php
+++ b/apps/files_trashbin/tests/CapabilitiesTest.php
@@ -27,7 +27,7 @@ class CapabilitiesTest extends TestCase {
 	/** @var Capabilities */
 	private $capabilities;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->capabilities = new Capabilities();
 	}
diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php
index 74231ada18b..530c6ff2549 100644
--- a/apps/files_trashbin/tests/Command/CleanUpTest.php
+++ b/apps/files_trashbin/tests/Command/CleanUpTest.php
@@ -61,7 +61,7 @@ class CleanUpTest extends TestCase {
 	/** @var string  */
 	protected $user0 = 'user0';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
 			->disableOriginalConstructor()->getMock();
diff --git a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
index a6891a6c07b..689c32cbceb 100644
--- a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
@@ -65,7 +65,7 @@ class PreviewControllerTest extends TestCase {
 	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	private $userSession;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php
index ace8e842e7b..69f822fcb84 100644
--- a/apps/files_versions/tests/Command/CleanupTest.php
+++ b/apps/files_versions/tests/Command/CleanupTest.php
@@ -48,7 +48,7 @@ class CleanupTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject | IRootFolder */
 	protected $rootFolder;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
index e771b82a42d..79afb8bd536 100644
--- a/apps/files_versions/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -64,7 +64,7 @@ class PreviewControllerTest extends TestCase {
 	/** @var IVersionManager|\PHPUnit_Framework_MockObject_MockObject */
 	private $versionManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index d878ea9c3da..3f51f619629 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -620,10 +620,10 @@ class VersioningTest extends \Test\TestCase {
 		$this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 */
+	
 	public function testExpireNonexistingUser() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		$this->logout();
 		// needed to have a FS setup (the background job does this)
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
diff --git a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php
index 3b18290ff8d..fb116ec2265 100644
--- a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php
+++ b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php
@@ -48,7 +48,7 @@ class LoginRedirectorControllerTest extends TestCase {
 	/** @var IL10N */
 	private $l;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/oauth2/tests/Controller/OauthApiControllerTest.php b/apps/oauth2/tests/Controller/OauthApiControllerTest.php
index 1c7bed848a7..613f97c9ced 100644
--- a/apps/oauth2/tests/Controller/OauthApiControllerTest.php
+++ b/apps/oauth2/tests/Controller/OauthApiControllerTest.php
@@ -61,7 +61,7 @@ class OauthApiControllerTest extends TestCase {
 	/** @var OauthApiController */
 	private $oauthApiController;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/oauth2/tests/Controller/SettingsControllerTest.php b/apps/oauth2/tests/Controller/SettingsControllerTest.php
index 6519f9cf087..2be63267a75 100644
--- a/apps/oauth2/tests/Controller/SettingsControllerTest.php
+++ b/apps/oauth2/tests/Controller/SettingsControllerTest.php
@@ -47,7 +47,7 @@ class SettingsControllerTest extends TestCase {
 	/** @var SettingsController */
 	private $settingsController;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/oauth2/tests/Db/AccessTokenMapperTest.php b/apps/oauth2/tests/Db/AccessTokenMapperTest.php
index 8d60b10d145..dc5ecb27efb 100644
--- a/apps/oauth2/tests/Db/AccessTokenMapperTest.php
+++ b/apps/oauth2/tests/Db/AccessTokenMapperTest.php
@@ -32,7 +32,7 @@ class AccessTokenMapperTest extends TestCase {
 	/** @var AccessTokenMapper */
 	private $accessTokenMapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->accessTokenMapper = new AccessTokenMapper(\OC::$server->getDatabaseConnection());
 	}
@@ -52,10 +52,10 @@ class AccessTokenMapperTest extends TestCase {
 		$this->accessTokenMapper->delete($token);
 	}
 
-	/**
-	 * @expectedException \OCA\OAuth2\Exceptions\AccessTokenNotFoundException
-	 */
+	
 	public function testDeleteByClientId() {
+		$this->expectException(\OCA\OAuth2\Exceptions\AccessTokenNotFoundException::class);
+
 		$this->accessTokenMapper->deleteByClientId(1234);
 		$token = new AccessToken();
 		$token->setClientId(1234);
diff --git a/apps/oauth2/tests/Db/ClientMapperTest.php b/apps/oauth2/tests/Db/ClientMapperTest.php
index 78400672cbb..1448cff109e 100644
--- a/apps/oauth2/tests/Db/ClientMapperTest.php
+++ b/apps/oauth2/tests/Db/ClientMapperTest.php
@@ -32,7 +32,7 @@ class ClientMapperTest extends TestCase {
 	/** @var ClientMapper */
 	private $clientMapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->clientMapper = new ClientMapper(\OC::$server->getDatabaseConnection());
 	}
@@ -48,10 +48,10 @@ class ClientMapperTest extends TestCase {
 		$this->assertEquals($client, $this->clientMapper->getByIdentifier('MyAwesomeClientIdentifier'));
 	}
 
-	/**
-	 * @expectedException \OCA\OAuth2\Exceptions\ClientNotFoundException
-	 */
+	
 	public function testGetByIdentifierNotExisting() {
+		$this->expectException(\OCA\OAuth2\Exceptions\ClientNotFoundException::class);
+
 		$this->clientMapper->getByIdentifier('MyTotallyNotExistingClient');
 	}
 
@@ -66,10 +66,10 @@ class ClientMapperTest extends TestCase {
 		$this->assertEquals($client, $this->clientMapper->getByUid($client->getId()));
 	}
 
-	/**
-	 * @expectedException \OCA\OAuth2\Exceptions\ClientNotFoundException
-	 */
+	
 	public function testGetByUidNotExisting() {
+		$this->expectException(\OCA\OAuth2\Exceptions\ClientNotFoundException::class);
+
 		$this->clientMapper->getByUid(1234);
 	}
 
diff --git a/apps/oauth2/tests/Settings/AdminTest.php b/apps/oauth2/tests/Settings/AdminTest.php
index ec8787db83f..2e5b0dcadba 100644
--- a/apps/oauth2/tests/Settings/AdminTest.php
+++ b/apps/oauth2/tests/Settings/AdminTest.php
@@ -40,7 +40,7 @@ class AdminTest extends TestCase {
 	/** @var ClientMapper|MockObject */
 	private $clientMapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->initialStateService = $this->createMock(IInitialStateService::class);
diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
index b7d40a6caac..ecc7393ad8f 100644
--- a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
@@ -332,10 +332,11 @@ class AppConfigControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider dataVerifyAppIdThrows
-	 * @expectedException \InvalidArgumentException
 	 * @param string $app
 	 */
 	public function testVerifyAppIdThrows($app) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$api = $this->getInstance();
 		$this->invokePrivate($api, 'verifyAppId', [$app]);
 	}
@@ -377,12 +378,13 @@ class AppConfigControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider dataVerifyConfigKeyThrows
-	 * @expectedException \InvalidArgumentException
 	 * @param string $app
 	 * @param string $key
 	 * @param string $value
 	 */
 	public function testVerifyConfigKeyThrows($app, $key, $value) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$api = $this->getInstance();
 		$this->invokePrivate($api, 'verifyConfigKey', [$app, $key, $value]);
 	}
diff --git a/apps/provisioning_api/tests/Controller/AppsControllerTest.php b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
index 1056d3ba4c1..5cd440e4202 100644
--- a/apps/provisioning_api/tests/Controller/AppsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
@@ -72,11 +72,11 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
 		$this->assertEquals($expected, $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 998
-	 */
+	
 	public function testGetAppInfoOnBadAppID() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(998);
+
 		$this->api->getAppInfo('not_provisioning_api');
 	}
 
@@ -109,11 +109,11 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
 		$this->assertEquals(count($disabled), count($data['apps']));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testGetAppsInvalidFilter() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$this->api->getApps('foo');
 	}
 }
diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
index 676b809169e..6204907f76e 100644
--- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
@@ -284,11 +284,11 @@ class GroupsControllerTest extends \Test\TestCase {
 		$this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 403
-	 */
+	
 	public function testGetGroupAsIrrelevantSubadmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(403);
+
 		$group = $this->createGroup('group');
 		$otherGroup = $this->createGroup('otherGroup');
 		$this->asSubAdminOfGroup($otherGroup);
@@ -329,23 +329,23 @@ class GroupsControllerTest extends \Test\TestCase {
 		$this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 404
-	 * @expectedExceptionMessage The requested group could not be found
-	 */
+	
 	public function testGetGroupNonExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('The requested group could not be found');
+		$this->expectExceptionCode(404);
+
 		$this->asUser();
 
 		$this->api->getGroup($this->getUniqueID());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Group does not exist
-	 */
+	
 	public function testGetSubAdminsOfGroupsNotExists() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Group does not exist');
+		$this->expectExceptionCode(101);
+
 		$this->api->getSubAdminsOfGroup('NonExistingGroup');
 	}
 
@@ -387,20 +387,20 @@ class GroupsControllerTest extends \Test\TestCase {
 		$this->assertEquals([], $result->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Invalid group name
-	 */
+	
 	public function testAddGroupEmptyGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Invalid group name');
+		$this->expectExceptionCode(101);
+
 		$this->api->addGroup('');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testAddGroupExistingGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$this->groupManager
 			->method('groupExists')
 			->with('ExistingGroup')
@@ -437,19 +437,19 @@ class GroupsControllerTest extends \Test\TestCase {
 		$this->api->addGroup('Iñtërnâtiônàlizætiøn');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testDeleteGroupNonExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$this->api->deleteGroup('NonExistingGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testDeleteAdminGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$this->groupManager
 			->method('groupExists')
 			->with('admin')
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index 0c4fcd5071c..c4bfff6d69b 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -219,11 +219,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testAddUserAlreadyExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$this->userManager
 			->expects($this->once())
 			->method('userExists')
@@ -253,12 +253,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addUser('AlreadyExistingUser', 'password', '', '', []);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 104
-	 * @expectedExceptionMessage group NonExistingGroup does not exist
-	 */
+	
 	public function testAddUserNonExistingGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('group NonExistingGroup does not exist');
+		$this->expectExceptionCode(104);
+
 		$this->userManager
 			->expects($this->once())
 			->method('userExists')
@@ -289,12 +289,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addUser('NewUser', 'pass', '', '', ['NonExistingGroup']);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 104
-	 * @expectedExceptionMessage group NonExistingGroup does not exist
-	 */
+	
 	public function testAddUserExistingGroupNonExistingGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('group NonExistingGroup does not exist');
+		$this->expectExceptionCode(104);
+
 		$this->userManager
 			->expects($this->once())
 			->method('userExists')
@@ -479,12 +479,12 @@ class UsersControllerTest extends TestCase {
 		));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 111
-	 * @expectedExceptionMessage Could not create non-existing user id
-	 */
+	
 	public function testAddUserFailedToGenerateUserID() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Could not create non-existing user id');
+		$this->expectExceptionCode(111);
+
 		$this->config
 			->expects($this->any())
 			->method('getAppValue')
@@ -522,12 +522,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addUser('', 'PasswordOfTheNewUser')->getData();
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 110
-	 * @expectedExceptionMessage Required email address was not provided
-	 */
+	
 	public function testAddUserEmailRequired() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Required email address was not provided');
+		$this->expectExceptionCode(110);
+
 		$this->config
 			->expects($this->any())
 			->method('getAppValue')
@@ -629,12 +629,12 @@ class UsersControllerTest extends TestCase {
 		));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Bad request
-	 */
+	
 	public function testAddUserUnsuccessful() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Bad request');
+		$this->expectExceptionCode(101);
+
 		$exception = new Exception('User backend not found.');
 		$this->userManager
 			->expects($this->once())
@@ -674,12 +674,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addUser('NewUser', 'PasswordOfTheNewUser');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 106
-	 * @expectedExceptionMessage no group specified (required for subadmins)
-	 */
+	
 	public function testAddUserAsSubAdminNoGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('no group specified (required for subadmins)');
+		$this->expectExceptionCode(106);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -707,12 +707,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', []);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 105
-	 * @expectedExceptionMessage insufficient privileges for group ExistingGroup
-	 */
+	
 	public function testAddUserAsSubAdminValidGroupNotSubAdmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('insufficient privileges for group ExistingGroup');
+		$this->expectExceptionCode(105);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -850,12 +850,12 @@ class UsersControllerTest extends TestCase {
 		));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 404
-	 * @expectedExceptionMessage User does not exist
-	 */
+	
 	public function testGetUserTargetDoesNotExist() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('User does not exist');
+		$this->expectExceptionCode(404);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -1142,11 +1142,11 @@ class UsersControllerTest extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testGetUserDataAsSubAdminAndUserIsNotAccessible() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -1376,11 +1376,11 @@ class UsersControllerTest extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testEditUserRegularUserSelfEditChangeEmailInvalid() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -1445,11 +1445,11 @@ class UsersControllerTest extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testEditUserRegularUserSelfEditChangeQuota() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -1510,12 +1510,12 @@ class UsersControllerTest extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 103
-	 * @expectedExceptionMessage Invalid quota value ABC
-	 */
+	
 	public function testEditUserAdminUserSelfEditChangeInvalidQuota() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Invalid quota value ABC');
+		$this->expectExceptionCode(103);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -1635,9 +1635,10 @@ class UsersControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider dataEditUserSelfEditChangeLanguageButForced
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
 	 */
 	public function testEditUserSelfEditChangeLanguageButForced($forced) {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+
 		$this->config->expects($this->any())
 			->method('getSystemValue')
 			->willReturnMap([
@@ -1719,9 +1720,10 @@ class UsersControllerTest extends TestCase {
 
 	/**
 	 * @dataProvider dataEditUserSelfEditChangeLanguageButForced
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
 	 */
 	public function testEditUserAdminEditChangeLanguageInvalidLanguage() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+
 
 		$this->l10nFactory->expects($this->once())
 			->method('findAvailableLanguages')
@@ -1801,11 +1803,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testEditUserSubadminUserInaccessible() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -1841,11 +1843,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->editUser('UserToEdit', 'quota', 'value');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testDeleteUserNotExistingUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -1864,11 +1866,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->deleteUser('UserToDelete');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testDeleteUserSelf() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -1925,11 +1927,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testDeleteUnsuccessfulUserAsAdmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2006,11 +2008,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testDeleteUnsuccessfulUserAsSubadmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2054,11 +2056,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->deleteUser('UserToDelete');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testDeleteUserAsSubAdminAndUserIsNotAccessible() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2098,11 +2100,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->deleteUser('UserToDelete');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 998
-	 */
+	
 	public function testGetUsersGroupsTargetUserNotExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(998);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
@@ -2235,11 +2237,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals(['groups' => ['Group1']], $this->api->getUsersGroups('UserToLookup')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->exactly(2))
@@ -2284,11 +2286,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->getUsersGroups('UserToLookup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testAddToGroupWithTargetGroupNotExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$this->groupManager->expects($this->once())
 			->method('get')
 			->with('GroupToAddTo')
@@ -2297,19 +2299,19 @@ class UsersControllerTest extends TestCase {
 		$this->api->addToGroup('TargetUser', 'GroupToAddTo');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testAddToGroupWithNoGroupSpecified() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$this->api->addToGroup('TargetUser');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 103
-	 */
+	
 	public function testAddToGroupWithTargetUserNotExisting() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(103);
+
 		$targetGroup = $this->createMock(IGroup::class);
 		$this->groupManager->expects($this->once())
 			->method('get')
@@ -2319,11 +2321,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->addToGroup('TargetUser', 'GroupToAddTo');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 104
-	 */
+	
 	public function testAddToGroupNoSubadmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(104);
+
 		$targetUser = $this->createMock(IUser::class);
 		$loggedInUser = $this->createMock(IUser::class);
 		$loggedInUser->expects($this->once())
@@ -2453,11 +2455,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo'));
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testRemoveFromGroupWithNoTargetGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
@@ -2467,11 +2469,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('TargetUser', '');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 */
+	
 	public function testRemoveFromGroupWithEmptyTargetGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
@@ -2481,11 +2483,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('TargetUser', '');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 */
+	
 	public function testRemoveFromGroupWithNotExistingTargetGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(102);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
@@ -2500,11 +2502,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 103
-	 */
+	
 	public function testRemoveFromGroupWithNotExistingTargetUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(103);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
 		$this->userSession
@@ -2525,11 +2527,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 104
-	 */
+	
 	public function testRemoveFromGroupWithoutPermission() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(104);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->once())
@@ -2566,12 +2568,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 105
-	 * @expectedExceptionMessage Cannot remove yourself from the admin group
-	 */
+	
 	public function testRemoveFromGroupAsAdminFromAdmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Cannot remove yourself from the admin group');
+		$this->expectExceptionCode(105);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2616,12 +2618,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('Admin', 'admin');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 105
-	 * @expectedExceptionMessage Cannot remove yourself from this group as you are a SubAdmin
-	 */
+	
 	public function testRemoveFromGroupAsSubAdminFromSubAdmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Cannot remove yourself from this group as you are a SubAdmin');
+		$this->expectExceptionCode(105);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2671,12 +2673,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeFromGroup('SubAdmin', 'subadmin');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 105
-	 * @expectedExceptionMessage Not viable to remove user from the last group you are SubAdmin of
-	 */
+	
 	public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Not viable to remove user from the last group you are SubAdmin of');
+		$this->expectExceptionCode(105);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$loggedInUser
 			->expects($this->any())
@@ -2774,12 +2776,12 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->removeFromGroup('AnotherUser', 'admin')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage User does not exist
-	 */
+	
 	public function testAddSubAdminWithNotExistingTargetUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('User does not exist');
+		$this->expectExceptionCode(101);
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -2789,12 +2791,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addSubAdmin('NotExistingUser', '');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 * @expectedExceptionMessage Group does not exist
-	 */
+	
 	public function testAddSubAdminWithNotExistingTargetGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Group does not exist');
+		$this->expectExceptionCode(102);
+
 
 		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userManager
@@ -2811,12 +2813,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->addSubAdmin('ExistingUser', 'NotExistingGroup');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 103
-	 * @expectedExceptionMessage Cannot create subadmins for admin group
-	 */
+	
 	public function testAddSubAdminToAdminGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Cannot create subadmins for admin group');
+		$this->expectExceptionCode(103);
+
 		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
 		$targetGroup
@@ -2898,12 +2900,12 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage User does not exist
-	 */
+	
 	public function testRemoveSubAdminNotExistingTargetUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('User does not exist');
+		$this->expectExceptionCode(101);
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -2913,12 +2915,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->removeSubAdmin('NotExistingUser', 'GroupToDeleteFrom');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Group does not exist
-	 */
+	
 	public function testRemoveSubAdminNotExistingTargetGroup() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Group does not exist');
+		$this->expectExceptionCode(101);
+
 		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$this->userManager
 			->expects($this->once())
@@ -2935,12 +2937,12 @@ class UsersControllerTest extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 * @expectedExceptionMessage User is not a subadmin of this group
-	 */
+	
 	public function testRemoveSubAdminFromNotASubadmin() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('User is not a subadmin of this group');
+		$this->expectExceptionCode(102);
+
 		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
 		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
 		$this->userManager
@@ -3001,12 +3003,12 @@ class UsersControllerTest extends TestCase {
 		$this->assertEquals([], $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 404
-	 * @expectedExceptionMessage User does not exist
-	 */
+	
 	public function testGetUserSubAdminGroupsNotExistingTargetUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('User does not exist');
+		$this->expectExceptionCode(404);
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -3155,10 +3157,10 @@ class UsersControllerTest extends TestCase {
 		$this->assertSame($expected, $api->getCurrentUser()->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 */
+	
 	public function testGetCurrentUserNotLoggedIn() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+
 
 		$this->userSession->expects($this->once())->method('getUser')
 			->willReturn(null);
@@ -3208,11 +3210,11 @@ class UsersControllerTest extends TestCase {
 		$this->assertSame($expected, $api->getUser('uid')->getData());
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 998
-	 */
+	
 	public function testResendWelcomeMessageWithNotExistingTargetUser() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(998);
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -3222,11 +3224,11 @@ class UsersControllerTest extends TestCase {
 		$this->api->resendWelcomeMessage('NotExistingUser');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 997
-	 */
+	
 	public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionCode(997);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -3267,12 +3269,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->resendWelcomeMessage('UserToGet');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Email address not available
-	 */
+	
 	public function testResendWelcomeMessageNoEmail() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Email address not available');
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -3308,12 +3310,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->resendWelcomeMessage('UserToGet');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 101
-	 * @expectedExceptionMessage Email address not available
-	 */
+	
 	public function testResendWelcomeMessageNullEmail() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Email address not available');
+		$this->expectExceptionCode(101);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -3448,12 +3450,12 @@ class UsersControllerTest extends TestCase {
 		$this->api->resendWelcomeMessage('UserToGet');
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\OCS\OCSException
-	 * @expectedExceptionCode 102
-	 * @expectedExceptionMessage Sending email failed
-	 */
+	
 	public function testResendWelcomeMessageFailed() {
+		$this->expectException(\OCP\AppFramework\OCS\OCSException::class);
+		$this->expectExceptionMessage('Sending email failed');
+		$this->expectExceptionCode(102);
+
 		$loggedInUser = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
index 70dad250585..ef3b20fa76c 100644
--- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
+++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
@@ -35,7 +35,7 @@ class ProvisioningApiMiddlewareTest extends TestCase {
 	/** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */
 	private $reflector;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->reflector = $this->createMock(IControllerMethodReflector::class);
diff --git a/apps/settings/tests/Controller/AdminSettingsControllerTest.php b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
index d3591c6d67a..21dc877975d 100644
--- a/apps/settings/tests/Controller/AdminSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
@@ -62,7 +62,7 @@ class AdminSettingsControllerTest extends TestCase {
 	/** @var string */
 	private $adminUid = 'lololo';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
@@ -87,7 +87,7 @@ class AdminSettingsControllerTest extends TestCase {
 		\OC::$server->getGroupManager()->createGroup('admin')->addUser($user);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		\OC::$server->getUserManager()->get($this->adminUid)->delete();
 
 		parent::tearDown();
diff --git a/apps/settings/tests/Controller/AppSettingsControllerTest.php b/apps/settings/tests/Controller/AppSettingsControllerTest.php
index 508a39642a5..536c3eea52a 100644
--- a/apps/settings/tests/Controller/AppSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AppSettingsControllerTest.php
@@ -76,7 +76,7 @@ class AppSettingsControllerTest extends TestCase {
 	/** @var ILogger|MockObject */
 	private $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/settings/tests/Controller/CertificateControllerTest.php b/apps/settings/tests/Controller/CertificateControllerTest.php
index 270e986e307..e5487f6892c 100644
--- a/apps/settings/tests/Controller/CertificateControllerTest.php
+++ b/apps/settings/tests/Controller/CertificateControllerTest.php
@@ -48,7 +48,7 @@ class CertificateControllerTest extends \Test\TestCase {
 	/** @var  ICertificateManager */
 	private $systemCertificateManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index b038cf2af34..ca0e9362de1 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -87,7 +87,7 @@ class CheckSetupControllerTest extends TestCase {
 	 */
 	private $dirsToRemove = [];
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)
diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
index eb5790a0401..d5d067f3eeb 100644
--- a/apps/settings/tests/Controller/UsersControllerTest.php
+++ b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -353,7 +353,6 @@ class UsersControllerTest extends \Test\TestCase {
 	 * @param bool $setDisplayNameResult
 	 * @param bool $canChangeEmail
 	 *
-	 * @expectedException \OC\ForbiddenException
 	 */
 	public function testSaveUserSettingsException($data,
 												  $oldEmailAddress,
@@ -361,6 +360,8 @@ class UsersControllerTest extends \Test\TestCase {
 												  $setDisplayNameResult,
 												  $canChangeEmail
 	) {
+		$this->expectException(\OC\ForbiddenException::class);
+
 		$controller = $this->getController();
 		$user = $this->createMock(IUser::class);
 
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index 77d606a9535..e84c4322562 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -57,7 +57,7 @@ class NewUserMailHelperTest extends TestCase {
 	/** @var \OCA\Settings\Mailer\NewUserMailHelper */
 	private $newUserMailHelper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->defaults = $this->createMock(Defaults::class);
diff --git a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
index e2434c01b02..51914604a98 100644
--- a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
+++ b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php
@@ -47,10 +47,10 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 		$this->subadminMiddleware = new SubadminMiddleware($this->reflector, false, $this->l10n);
 	}
 
-	/**
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\NotAdminException
-	 */
+	
 	public function testBeforeControllerAsUserWithExemption() {
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\NotAdminException::class);
+
 		$this->reflector
 			->expects($this->once())
 			->method('hasAnnotation')
@@ -93,10 +93,10 @@ class SubadminMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expectedResponse, $this->subadminMiddleware->afterException($this->controller, 'foo', new NotAdminException('')));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testAfterRegularException() {
+		$this->expectException(\Exception::class);
+
 		$expectedResponse = new TemplateResponse('core', '403', array(), 'guest');
 		$expectedResponse->setStatus(403);
 		$this->subadminMiddleware->afterException($this->controller, 'foo', new \Exception());
diff --git a/apps/settings/tests/Personal/Security/AuthtokensTest.php b/apps/settings/tests/Personal/Security/AuthtokensTest.php
index d0af05df913..e2e5d3e6234 100644
--- a/apps/settings/tests/Personal/Security/AuthtokensTest.php
+++ b/apps/settings/tests/Personal/Security/AuthtokensTest.php
@@ -52,7 +52,7 @@ class AuthtokensTest extends TestCase {
 	/** @var Security\Authtokens */
 	private $section;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->authTokenProvider = $this->createMock(IAuthTokenProvider::class);
diff --git a/apps/settings/tests/Settings/Admin/MailTest.php b/apps/settings/tests/Settings/Admin/MailTest.php
index 1b47dc874c1..011329e7b89 100644
--- a/apps/settings/tests/Settings/Admin/MailTest.php
+++ b/apps/settings/tests/Settings/Admin/MailTest.php
@@ -34,7 +34,7 @@ class MailTest extends TestCase {
 	/** @var IConfig */
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
 
diff --git a/apps/settings/tests/Settings/Admin/SecurityTest.php b/apps/settings/tests/Settings/Admin/SecurityTest.php
index 778690de1c8..6ddc0d39822 100644
--- a/apps/settings/tests/Settings/Admin/SecurityTest.php
+++ b/apps/settings/tests/Settings/Admin/SecurityTest.php
@@ -44,7 +44,7 @@ class SecurityTest extends TestCase {
 	/** @var IInitialStateService|MockObject */
 	private $initialState;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->manager = $this->getMockBuilder(Manager::class)->disableOriginalConstructor()->getMock();
 		$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
diff --git a/apps/settings/tests/Settings/Admin/ServerTest.php b/apps/settings/tests/Settings/Admin/ServerTest.php
index 57c984fdb12..727284fdca4 100644
--- a/apps/settings/tests/Settings/Admin/ServerTest.php
+++ b/apps/settings/tests/Settings/Admin/ServerTest.php
@@ -34,7 +34,7 @@ class ServerTest extends TestCase {
 	/** @var IConfig */
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 
diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php
index 37046d9d319..38f687b87ae 100644
--- a/apps/settings/tests/Settings/Admin/SharingTest.php
+++ b/apps/settings/tests/Settings/Admin/SharingTest.php
@@ -42,7 +42,7 @@ class SharingTest extends TestCase {
 	/** @var  IManager|\PHPUnit_Framework_MockObject_MockObject */
 	private $shareManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
 		$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
diff --git a/apps/settings/tests/Settings/Personal/SecurityTest.php b/apps/settings/tests/Settings/Personal/SecurityTest.php
index 671fcd6f9b4..ba51a9d7e32 100644
--- a/apps/settings/tests/Settings/Personal/SecurityTest.php
+++ b/apps/settings/tests/Settings/Personal/SecurityTest.php
@@ -58,7 +58,7 @@ class SecurityTest extends TestCase {
 	/** @var Security */
 	private $section;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->initialStateService = $this->createMock(IInitialStateService::class);
diff --git a/apps/sharebymail/tests/CapabilitiesTest.php b/apps/sharebymail/tests/CapabilitiesTest.php
index 96fce010c1d..1e19ffd2eaf 100644
--- a/apps/sharebymail/tests/CapabilitiesTest.php
+++ b/apps/sharebymail/tests/CapabilitiesTest.php
@@ -26,7 +26,7 @@ class CapabilitiesTest extends TestCase {
 	/** @var Capabilities */
 	private $capabilities;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->capabilities = new Capabilities();
diff --git a/apps/sharebymail/tests/SettingsTest.php b/apps/sharebymail/tests/SettingsTest.php
index 12d8fc4d919..a05d4f5926b 100644
--- a/apps/sharebymail/tests/SettingsTest.php
+++ b/apps/sharebymail/tests/SettingsTest.php
@@ -34,7 +34,7 @@ class SettingsTest extends TestCase  {
 	/** @var  SettingsManager | \PHPUnit_Framework_MockObject_MockObject */
 	private $settingsManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->settingsManager = $this->getMockBuilder(SettingsManager::class)
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index 678e6cc0da0..4efd528b2d1 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -97,7 +97,7 @@ class ShareByMailProviderTest extends TestCase {
 	/** @var  CapabilitiesManager | \PHPUnit_Framework_MockObject_MockObject */
 	private $capabilitiesManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = \OC::$server->getShareManager();
@@ -174,7 +174,7 @@ class ShareByMailProviderTest extends TestCase {
 
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->connection->getQueryBuilder()->delete('share')->execute();
 
 		parent::tearDown();
@@ -305,10 +305,10 @@ class ShareByMailProviderTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testCreateFailed() {
+		$this->expectException(\Exception::class);
+
 		$this->share->expects($this->once())->method('getSharedWith')->willReturn('user1');
 		$node = $this->getMockBuilder('OCP\Files\Node')->getMock();
 		$node->expects($this->any())->method('getName')->willReturn('fileName');
@@ -348,10 +348,10 @@ class ShareByMailProviderTest extends TestCase {
 
 	}
 
-	/**
-	 * @expectedException \OC\HintException
-	 */
+	
 	public function testCreateMailShareFailed() {
+		$this->expectException(\OC\HintException::class);
+
 		$this->share->expects($this->any())->method('getToken')->willReturn('token');
 		$this->share->expects($this->once())->method('setToken')->with('token');
 		$node = $this->getMockBuilder('OCP\Files\Node')->getMock();
@@ -572,10 +572,10 @@ class ShareByMailProviderTest extends TestCase {
 		$this->assertInstanceOf('OCP\Share\IShare', $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetShareByIdFailed() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$instance = $this->getInstance(['createShareObject']);
 
 		$itemSource = 11;
@@ -657,10 +657,10 @@ class ShareByMailProviderTest extends TestCase {
 		$this->assertInstanceOf('OCP\Share\IShare', $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetShareByTokenFailed() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 
 		$itemSource = 11;
 		$itemType = 'file';
@@ -774,10 +774,10 @@ class ShareByMailProviderTest extends TestCase {
 		$this->assertSame($token, $result['token']);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetRawShareFailed() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$itemSource = 11;
 		$itemType = 'file';
 		$shareWith = 'user@server.com';
diff --git a/apps/systemtags/tests/Activity/SettingTest.php b/apps/systemtags/tests/Activity/SettingTest.php
index 0cb6f505371..489f5fd8ca0 100644
--- a/apps/systemtags/tests/Activity/SettingTest.php
+++ b/apps/systemtags/tests/Activity/SettingTest.php
@@ -29,7 +29,7 @@ class SettingTest extends TestCase {
 	/** @var Setting */
 	private $setting;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->l = $this->createMock(IL10N::class);
 
diff --git a/apps/systemtags/tests/Settings/AdminTest.php b/apps/systemtags/tests/Settings/AdminTest.php
index b9b7fb60f85..3e878ac3c6c 100644
--- a/apps/systemtags/tests/Settings/AdminTest.php
+++ b/apps/systemtags/tests/Settings/AdminTest.php
@@ -32,7 +32,7 @@ class AdminTest extends TestCase {
 	/** @var Admin */
 	private $admin;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->admin = new Admin();
diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php
index df0fdd52b3f..9d5970fd384 100644
--- a/apps/theming/tests/Controller/IconControllerTest.php
+++ b/apps/theming/tests/Controller/IconControllerTest.php
@@ -61,7 +61,7 @@ class IconControllerTest extends TestCase {
 	/** @var ImageManager */
 	private $imageManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->request = $this->createMock(IRequest::class);
 		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
 		$this->iconBuilder = $this->createMock(IconBuilder::class);
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index a626fdebe6d..8d4650e68b3 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -83,7 +83,7 @@ class ThemingControllerTest extends TestCase {
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->request = $this->createMock(IRequest::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 56fa63bea7b..7d61b80efdf 100644
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -184,10 +184,10 @@ class ImageManagerTest extends TestCase {
 		$this->assertEquals($file, $this->imageManager->getImage('logo', false));
 	}
 
-	/**
-	 * @expectedException OCP\Files\NotFoundException
-	 */
+	
 	public function testGetImageUnset() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$this->config->expects($this->once())
 			->method('getAppValue')->with('theming', 'logoMime', false)
 			->willReturn(false);
@@ -239,10 +239,10 @@ class ImageManagerTest extends TestCase {
 		$this->assertEquals($expected, $this->imageManager->getCachedImage('filename'));
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetCachedImageNotFound() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$folder = $this->setupCacheFolder();
 		$folder->expects($this->once())
 			->method('getFile')
diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php
index 4e89366c3f2..50d0e454445 100644
--- a/apps/theming/tests/Settings/AdminTest.php
+++ b/apps/theming/tests/Settings/AdminTest.php
@@ -50,7 +50,7 @@ class AdminTest extends TestCase {
 	/** @var IL10N */
 	private $l10n;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->l10n = $this->createMock(IL10N::class);
diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php
index 10d6bb172f2..dff2df3502a 100644
--- a/apps/theming/tests/Settings/SectionTest.php
+++ b/apps/theming/tests/Settings/SectionTest.php
@@ -37,7 +37,7 @@ class SectionTest extends TestCase {
 	/** @var Section */
 	private $section;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->url = $this->createMock(IURLGenerator::class);
 		$this->l = $this->createMock(IL10N::class);
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index b7413eaf47d..20c80211b8d 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -72,7 +72,7 @@ class ThemingDefaultsTest extends TestCase {
 	/** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */
 	private $navigationManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->l10n = $this->createMock(IL10N::class);
diff --git a/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/CheckBackupCodeTest.php b/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/CheckBackupCodeTest.php
index 2e68c0e427b..3e14cbfa3a1 100644
--- a/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/CheckBackupCodeTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/CheckBackupCodeTest.php
@@ -55,7 +55,7 @@ class CheckBackupCodeTest extends TestCase {
 	/** @var CheckBackupCodes */
 	private $checkBackupCodes;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
diff --git a/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/RememberBackupCodesJobTest.php b/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/RememberBackupCodesJobTest.php
index a6dda9ce6aa..0410facb4f7 100644
--- a/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/RememberBackupCodesJobTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/BackgroundJob/RememberBackupCodesJobTest.php
@@ -54,7 +54,7 @@ class RememberBackupCodesJobTest extends TestCase {
 	/** @var RememberBackupCodesJob */
 	private $job;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->registry = $this->createMock(IRegistry::class);
diff --git a/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php b/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php
index 0bbdc8619b4..73754cecb95 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php
@@ -64,10 +64,10 @@ class NotifierTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareWrongApp() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->once())
@@ -79,10 +79,10 @@ class NotifierTest extends TestCase {
 		$this->notifier->prepare($notification, 'en');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testPrepareWrongSubject() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->once())
diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php
index 38baeb907b5..ca380184215 100644
--- a/apps/updatenotification/tests/Controller/AdminControllerTest.php
+++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php
@@ -52,7 +52,7 @@ class AdminControllerTest extends TestCase {
 	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/apps/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
index 9e35194f066..117c2ad86ae 100644
--- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php
+++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
@@ -52,7 +52,7 @@ class BackgroundJobTest extends TestCase {
 	/** @var Installer|\PHPUnit_Framework_MockObject_MockObject */
 	protected $installer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/updatenotification/tests/Notification/NotifierTest.php b/apps/updatenotification/tests/Notification/NotifierTest.php
index d7a3fbbb149..b6620bb9c69 100644
--- a/apps/updatenotification/tests/Notification/NotifierTest.php
+++ b/apps/updatenotification/tests/Notification/NotifierTest.php
@@ -50,7 +50,7 @@ class NotifierTest extends TestCase {
 	/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $groupManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
diff --git a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
index c604da85706..eb9e11594ba 100644
--- a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
+++ b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
@@ -37,7 +37,7 @@ class ResetTokenBackgroundJobTest extends TestCase {
 	/** @var ResetTokenBackgroundJob */
 	private $resetTokenBackgroundJob;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
index a0b7c4b0fe3..049d9bf5b9a 100644
--- a/apps/updatenotification/tests/Settings/AdminTest.php
+++ b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -55,7 +55,7 @@ class AdminTest extends TestCase {
 	/** @var IRegistry|\PHPUnit_Framework_MockObject_MockObject */
 	private $subscriptionRegistry;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/updatenotification/tests/UpdateCheckerTest.php b/apps/updatenotification/tests/UpdateCheckerTest.php
index 1ad45074554..00c8aa569db 100644
--- a/apps/updatenotification/tests/UpdateCheckerTest.php
+++ b/apps/updatenotification/tests/UpdateCheckerTest.php
@@ -38,7 +38,7 @@ class UpdateCheckerTest extends TestCase {
 	/** @var UpdateChecker */
 	private $updateChecker;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->updater = $this->createMock(VersionCheck::class);
diff --git a/apps/user_ldap/lib/WizardResult.php b/apps/user_ldap/lib/WizardResult.php
index e5294a76506..8e2f519deee 100644
--- a/apps/user_ldap/lib/WizardResult.php
+++ b/apps/user_ldap/lib/WizardResult.php
@@ -40,9 +40,7 @@ class WizardResult {
 		$this->changes[$key] = $value;
 	}
 
-	/**
-	 *
-	 */
+	
 	public function markChange() {
 		$this->markedChange = true;
 	}
diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php
index 0d327ce2e06..004a2619219 100644
--- a/apps/user_ldap/tests/AccessTest.php
+++ b/apps/user_ldap/tests/AccessTest.php
@@ -78,7 +78,7 @@ class AccessTest extends TestCase {
 	/** @var Access */
 	private $access;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->connection = $this->createMock(Connection::class);
 		$this->ldap = $this->createMock(LDAP::class);
 		$this->userManager = $this->createMock(Manager::class);
@@ -441,11 +441,11 @@ class AccessTest extends TestCase {
 		$this->assertSame($values[0], strtolower($dnFromServer));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage LDAP password changes are disabled
-	 */
+	
 	public function testSetPasswordWithDisabledChanges() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('LDAP password changes are disabled');
+
 		$this->connection
 			->method('__get')
 			->willReturn(false);
@@ -473,11 +473,11 @@ class AccessTest extends TestCase {
 		$this->assertFalse($this->access->setPassword('CN=foo', 'MyPassword'));
 	}
 
-	/**
-	 * @expectedException \OC\HintException
-	 * @expectedExceptionMessage Password change rejected.
-	 */
+	
 	public function testSetPasswordWithRejectedChange() {
+		$this->expectException(\OC\HintException::class);
+		$this->expectExceptionMessage('Password change rejected.');
+
 		$this->connection
 			->method('__get')
 			->willReturn(true);
diff --git a/apps/user_ldap/tests/ConfigurationTest.php b/apps/user_ldap/tests/ConfigurationTest.php
index 5820fff25ed..4298c8f294b 100644
--- a/apps/user_ldap/tests/ConfigurationTest.php
+++ b/apps/user_ldap/tests/ConfigurationTest.php
@@ -29,7 +29,7 @@ class ConfigurationTest extends \Test\TestCase {
 	/** @var Configuration */
 	protected $configuration;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->configuration = new Configuration('t01', false);
 	}
diff --git a/apps/user_ldap/tests/ConnectionTest.php b/apps/user_ldap/tests/ConnectionTest.php
index f08b5d9bf1d..3090c56c11c 100644
--- a/apps/user_ldap/tests/ConnectionTest.php
+++ b/apps/user_ldap/tests/ConnectionTest.php
@@ -44,7 +44,7 @@ class ConnectionTest extends \Test\TestCase {
 	/** @var  Connection */
 	protected $connection;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->ldap       = $this->createMock(ILDAPWrapper::class);
diff --git a/apps/user_ldap/tests/GroupLDAPPluginTest.php b/apps/user_ldap/tests/GroupLDAPPluginTest.php
index 3b8bfd795c5..773f937a77e 100644
--- a/apps/user_ldap/tests/GroupLDAPPluginTest.php
+++ b/apps/user_ldap/tests/GroupLDAPPluginTest.php
@@ -84,11 +84,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->createGroup('group');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements createGroup in this LDAP Backend.
-	 */
+	
 	public function testCreateGroupNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements createGroup in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->createGroup('foo');
 	}
@@ -114,11 +114,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->deleteGroup('group');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements deleteGroup in this LDAP Backend.
-	 */
+	
 	public function testDeleteGroupNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements deleteGroup in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->deleteGroup('foo');
 	}
@@ -145,11 +145,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->addToGroup('uid', 'gid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements addToGroup in this LDAP Backend.
-	 */
+	
 	public function testAddToGroupNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements addToGroup in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->addToGroup('foo', 'bar');
 	}	
@@ -176,11 +176,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->removeFromGroup('uid', 'gid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements removeFromGroup in this LDAP Backend.
-	 */
+	
 	public function testRemoveFromGroupNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements removeFromGroup in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->removeFromGroup('foo', 'bar');
 	}
@@ -207,11 +207,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->countUsersInGroup('gid', 'search');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements countUsersInGroup in this LDAP Backend.
-	 */
+	
 	public function testCountUsersInGroupNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements countUsersInGroup in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->countUsersInGroup('foo', 'bar');
 	}	
@@ -237,11 +237,11 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->getGroupDetails('gid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements getGroupDetails in this LDAP Backend.
-	 */
+	
 	public function testgetGroupDetailsNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements getGroupDetails in this LDAP Backend.');
+
 		$pluginManager = $this->getGroupPluginManager();
 		$pluginManager->getGroupDetails('foo');
 	}
diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php
index e0ece5d50a6..2dae666d1dc 100644
--- a/apps/user_ldap/tests/Group_LDAPTest.php
+++ b/apps/user_ldap/tests/Group_LDAPTest.php
@@ -770,10 +770,10 @@ class Group_LDAPTest extends TestCase {
 		$this->assertEquals($ldap->createGroup('gid'),true);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testCreateGroupFailing() {
+		$this->expectException(\Exception::class);
+
 		/** @var GroupPluginManager|\PHPUnit_Framework_MockObject_MockObject $pluginManager */
 		$pluginManager = $this->getMockBuilder('\OCA\User_LDAP\GroupPluginManager')
 			->setMethods(['implementsActions', 'createGroup'])
@@ -825,10 +825,10 @@ class Group_LDAPTest extends TestCase {
 		$this->assertEquals($ldap->deleteGroup('gid'),'result');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testDeleteGroupFailing() {
+		$this->expectException(\Exception::class);
+
 		/** @var GroupPluginManager|\PHPUnit_Framework_MockObject_MockObject $pluginManager */
 		$pluginManager = $this->getMockBuilder('\OCA\User_LDAP\GroupPluginManager')
 			->setMethods(['implementsActions', 'deleteGroup'])
@@ -871,10 +871,10 @@ class Group_LDAPTest extends TestCase {
 		$this->assertEquals($ldap->addToGroup('uid', 'gid'),'result');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testAddToGroupFailing() {
+		$this->expectException(\Exception::class);
+
 		/** @var GroupPluginManager|\PHPUnit_Framework_MockObject_MockObject $pluginManager */
 		$pluginManager = $this->getMockBuilder('\OCA\User_LDAP\GroupPluginManager')
 			->setMethods(['implementsActions', 'addToGroup'])
@@ -917,10 +917,10 @@ class Group_LDAPTest extends TestCase {
 		$this->assertEquals($ldap->removeFromGroup('uid', 'gid'),'result');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testRemoveFromGroupFailing() {
+		$this->expectException(\Exception::class);
+
 		/** @var GroupPluginManager|\PHPUnit_Framework_MockObject_MockObject $pluginManager */
 		$pluginManager = $this->getMockBuilder('\OCA\User_LDAP\GroupPluginManager')
 			->setMethods(['implementsActions', 'removeFromGroup'])
@@ -963,10 +963,10 @@ class Group_LDAPTest extends TestCase {
 		$this->assertEquals($ldap->getGroupDetails('gid'),'result');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testGetGroupDetailsFailing() {
+		$this->expectException(\Exception::class);
+
 		/** @var GroupPluginManager|\PHPUnit_Framework_MockObject_MockObject $pluginManager */
 		$pluginManager = $this->getMockBuilder('\OCA\User_LDAP\GroupPluginManager')
 			->setMethods(['implementsActions', 'getGroupDetails'])
diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php
index 3804938199d..eae87a6a924 100644
--- a/apps/user_ldap/tests/HelperTest.php
+++ b/apps/user_ldap/tests/HelperTest.php
@@ -36,7 +36,7 @@ class HelperTest extends \Test\TestCase {
 	/** @var Helper */
 	private $helper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/user_ldap/tests/Jobs/SyncTest.php b/apps/user_ldap/tests/Jobs/SyncTest.php
index d16ce6672df..e45f1d3fd10 100644
--- a/apps/user_ldap/tests/Jobs/SyncTest.php
+++ b/apps/user_ldap/tests/Jobs/SyncTest.php
@@ -69,7 +69,7 @@ class SyncTest extends TestCase {
 	/** @var AccessFactory|\PHPUnit_Framework_MockObject_MockObject */
 	protected $accessFactory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->helper = $this->createMock(Helper::class);
diff --git a/apps/user_ldap/tests/LDAPProviderTest.php b/apps/user_ldap/tests/LDAPProviderTest.php
index cbce73be295..03756e85cc5 100644
--- a/apps/user_ldap/tests/LDAPProviderTest.php
+++ b/apps/user_ldap/tests/LDAPProviderTest.php
@@ -103,11 +103,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		return $factory->getLDAPProvider();
 	}
 	
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetUserDNUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			 ->setMethods(['userExists'])
 			 ->disableOriginalConstructor()
@@ -142,11 +142,11 @@ class LDAPProviderTest extends \Test\TestCase {
 			$ldapProvider->getUserDN('existing_user'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Group id not found in LDAP
-	 */
+	
 	public function testGetGroupDNGroupIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Group id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->disableOriginalConstructor()
 			->getMock();
@@ -240,11 +240,11 @@ class LDAPProviderTest extends \Test\TestCase {
 			$ldapProvider->sanitizeDN('cn=existing_user,ou=Are Sufficient To,ou=Test,dc=example,dc=org'));
 	}
 	
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetLDAPConnectionUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			 ->setMethods(['userExists'])
 			 ->disableOriginalConstructor()
@@ -275,11 +275,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertTrue($ldapProvider->getLDAPConnection('existing_user'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Group id not found in LDAP
-	 */
+	
 	public function testGetGroupLDAPConnectionGroupIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Group id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->disableOriginalConstructor()
 			->getMock();
@@ -321,11 +321,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertTrue($ldapProvider->getGroupLDAPConnection('existing_group'));
 	}
 	
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetLDAPBaseUsersUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			 ->setMethods(['userExists'])
 			 ->disableOriginalConstructor()
@@ -384,11 +384,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertEquals($bases[1], $ldapProvider->getLDAPBaseUsers('existing_user'));
 	}
 	
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetLDAPBaseGroupsUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			 ->setMethods(['userExists'])
 			 ->disableOriginalConstructor()
@@ -440,11 +440,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertEquals($bases[0], $ldapProvider->getLDAPBaseGroups('existing_user'));
 	}
 	
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testClearCacheUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			 ->setMethods(['userExists'])
 			 ->disableOriginalConstructor()
@@ -479,11 +479,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Group id not found in LDAP
-	 */
+	
 	public function testClearGroupCacheGroupIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Group id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->disableOriginalConstructor()
 			->getMock();
@@ -565,11 +565,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetLDAPDisplayNameFieldUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->setMethods(['userExists'])
 			->disableOriginalConstructor()
@@ -603,11 +603,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertEquals('displayName', $ldapProvider->getLDAPDisplayNameField('existing_user'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage User id not found in LDAP
-	 */
+	
 	public function testGetLDAPEmailFieldUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('User id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->setMethods(['userExists'])
 			->disableOriginalConstructor()
@@ -641,11 +641,11 @@ class LDAPProviderTest extends \Test\TestCase {
 		$this->assertEquals('mail', $ldapProvider->getLDAPEmailField('existing_user'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Group id not found in LDAP
-	 */
+	
 	public function testGetLDAPGroupMemberAssocUserIDNotFound() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Group id not found in LDAP');
+
 		$userBackend = $this->getMockBuilder('OCA\User_LDAP\User_LDAP')
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/apps/user_ldap/tests/LDAPTest.php b/apps/user_ldap/tests/LDAPTest.php
index a6c097c6f85..441124cdf4d 100644
--- a/apps/user_ldap/tests/LDAPTest.php
+++ b/apps/user_ldap/tests/LDAPTest.php
@@ -30,7 +30,7 @@ class LDAPTest extends TestCase  {
 	/** @var LDAP|\PHPUnit_Framework_MockObject_MockObject */
 	private $ldap;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->ldap = $this->getMockBuilder(LDAP::class)
 			->setMethods(['invokeLDAPMethod'])
diff --git a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php
index 323a3464ce8..60e92ab926c 100644
--- a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php
+++ b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php
@@ -58,7 +58,7 @@ abstract class AbstractUUIDFixTest extends TestCase {
 	/** @var bool */
 	protected $isUser = true;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->ldap = $this->createMock(LDAP::class);
diff --git a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php
index c0bbd8098b1..3adcdec35ea 100644
--- a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php
+++ b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php
@@ -35,7 +35,7 @@ use OCA\User_LDAP\Tests\Migration\AbstractUUIDFixTest;
  * @group DB
  */
 class UUIDFixGroupTest extends AbstractUUIDFixTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->isUser = false;
 		parent::setUp();
 
diff --git a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
index 32f601f2b11..a39338186e8 100644
--- a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
+++ b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
@@ -47,7 +47,7 @@ class UUIDFixInsertTest extends TestCase {
 	/** @var  UUIDFixInsert */
 	protected $job;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = $this->createMock(IJobList::class);
diff --git a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php
index 8e91a00156b..6793a8dd8ce 100644
--- a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php
+++ b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php
@@ -34,7 +34,7 @@ use OCA\User_LDAP\User_Proxy;
  * @group DB
  */
 class UUIDFixUserTest extends AbstractUUIDFixTest {
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->isUser = true;
 		parent::setUp();
 
diff --git a/apps/user_ldap/tests/Settings/AdminTest.php b/apps/user_ldap/tests/Settings/AdminTest.php
index d421c379bf5..156033bcb8c 100644
--- a/apps/user_ldap/tests/Settings/AdminTest.php
+++ b/apps/user_ldap/tests/Settings/AdminTest.php
@@ -43,7 +43,7 @@ class AdminTest extends TestCase {
 	/** @var IL10N */
 	private $l10n;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
 
diff --git a/apps/user_ldap/tests/Settings/SectionTest.php b/apps/user_ldap/tests/Settings/SectionTest.php
index 0bd7a8010b6..60a36971314 100644
--- a/apps/user_ldap/tests/Settings/SectionTest.php
+++ b/apps/user_ldap/tests/Settings/SectionTest.php
@@ -37,7 +37,7 @@ class SectionTest extends TestCase {
 	/** @var Section */
 	private $section;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->url = $this->createMock(IURLGenerator::class);
 		$this->l = $this->createMock(IL10N::class);
diff --git a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php
index e81a81f742f..c6f2d9bebd2 100644
--- a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php
+++ b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php
@@ -48,7 +48,7 @@ class DeletedUsersIndexTest extends \Test\TestCase {
 	/** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */
 	protected $mapping;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		// no mocks for those as tests go against DB
@@ -63,7 +63,7 @@ class DeletedUsersIndexTest extends \Test\TestCase {
 		$this->dui = new DeletedUsersIndex($this->config, $this->db, $this->mapping);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->config->deleteAppFromAllUsers('user_ldap');
 		parent::tearDown();
 	}
diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php
index a8abd1e4667..896e981883f 100644
--- a/apps/user_ldap/tests/User/ManagerTest.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -86,7 +86,7 @@ class ManagerTest extends \Test\TestCase {
 	/** @var Manager */
 	protected $manager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->access = $this->createMock(Access::class);
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index 992d3ce990c..5a94dd39cc6 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends \Test\TestCase {
 	/** @var User */
 	protected $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = $this->createMock(Connection::class);
@@ -1114,10 +1114,10 @@ class UserTest extends \Test\TestCase {
 		$this->assertFalse($this->user->getHomePath());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testGetHomePathConfiguredNotAvailableNotAllowed() {
+		$this->expectException(\Exception::class);
+
 		$this->connection->expects($this->any())
 			->method('__get')
 			->with($this->equalTo('homeFolderNamingRule'))
diff --git a/apps/user_ldap/tests/UserLDAPPluginTest.php b/apps/user_ldap/tests/UserLDAPPluginTest.php
index 1d7d2ee7c75..fac6156450a 100644
--- a/apps/user_ldap/tests/UserLDAPPluginTest.php
+++ b/apps/user_ldap/tests/UserLDAPPluginTest.php
@@ -85,11 +85,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->createUser('user', 'password');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements createUser in this LDAP Backend.
-	 */
+	
 	public function testCreateUserNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements createUser in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->createUser('foo','bar');
 	}
@@ -116,11 +116,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->setPassword('user', 'password');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements setPassword in this LDAP Backend.
-	 */
+	
 	public function testSetPasswordNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements setPassword in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->setPassword('foo','bar');
 	}
@@ -146,11 +146,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->getHome('uid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements getHome in this LDAP Backend.
-	 */
+	
 	public function testGetHomeNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements getHome in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->getHome('foo');
 	}	
@@ -176,11 +176,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->getDisplayName('uid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements getDisplayName in this LDAP Backend.
-	 */
+	
 	public function testGetDisplayNameNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements getDisplayName in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->getDisplayName('foo');
 	}
@@ -207,11 +207,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->setDisplayName('user', 'password');		
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements setDisplayName in this LDAP Backend.
-	 */
+	
 	public function testSetDisplayNameNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements setDisplayName in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->setDisplayName('foo', 'bar');
 	}	
@@ -237,11 +237,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->canChangeAvatar('uid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements canChangeAvatar in this LDAP Backend.
-	 */
+	
 	public function testCanChangeAvatarNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements canChangeAvatar in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->canChangeAvatar('foo');
 	}
@@ -264,11 +264,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->countUsers();
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements countUsers in this LDAP Backend.
-	 */
+	
 	public function testCountUsersNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements countUsers in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->countUsers();
 	}	
@@ -300,11 +300,11 @@ class UserLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->deleteUser('uid');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage No plugin implements deleteUser in this LDAP Backend.
-	 */
+	
 	public function testDeleteUserNotRegistered() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('No plugin implements deleteUser in this LDAP Backend.');
+
 		$pluginManager = $this->getUserPluginManager();
 		$pluginManager->deleteUser('foo');
 	}
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index e8076a051a1..b4766300df5 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -787,10 +787,10 @@ class User_LDAPTest extends TestCase {
 		$this->assertEquals($dataDir.'/susannah/', $result);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testGetHomeNoPath() {
+		$this->expectException(\Exception::class);
+
 		$backend = new UserLDAP($this->access, $this->config, $this->notificationManager, $this->session, $this->pluginManager);
 		$this->prepareMockForUserExists();
 
@@ -836,10 +836,10 @@ class User_LDAPTest extends TestCase {
 		$this->assertFalse($result);
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 */
+	
 	public function testGetHomeDeletedUser() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		$uid = 'newyorker';
 
 		$backend = new UserLDAP($this->access, $this->config, $this->notificationManager, $this->session, $this->pluginManager);
@@ -1280,11 +1280,11 @@ class User_LDAPTest extends TestCase {
 			   }));
 	}
 
-	/**
-	 * @expectedException \OC\HintException
-	 * @expectedExceptionMessage Password fails quality checking policy
-	 */
+	
 	public function testSetPasswordInvalid() {
+		$this->expectException(\OC\HintException::class);
+		$this->expectExceptionMessage('Password fails quality checking policy');
+
 		$this->prepareAccessForSetPassword($this->access);
 		$this->userManager->expects($this->atLeastOnce())
 			->method('get')
@@ -1324,11 +1324,11 @@ class User_LDAPTest extends TestCase {
 		$this->assertFalse(\OC_User::setPassword('roland', 'dt12234$'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage LDAP setPassword: Could not get user object for uid NotExistingUser. Maybe the LDAP entry has no set display name attribute?
-	 */
+	
 	public function testSetPasswordWithInvalidUser() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('LDAP setPassword: Could not get user object for uid NotExistingUser. Maybe the LDAP entry has no set display name attribute?');
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -1425,10 +1425,10 @@ class User_LDAPTest extends TestCase {
 		$this->assertEquals($newDisplayName, $this->backend->setDisplayName('uid', $newDisplayName));
 	}
 
-	/**
-	 * @expectedException \OC\HintException
-	 */
+	
 	public function testSetDisplayNameErrorWithPlugin() {
+		$this->expectException(\OC\HintException::class);
+
 		$newDisplayName = 'J. Baker';
 		$this->pluginManager->expects($this->once())
 			->method('implementsActions')
diff --git a/apps/user_ldap/tests/User_ProxyTest.php b/apps/user_ldap/tests/User_ProxyTest.php
index 02a1815804c..dc9758013fe 100644
--- a/apps/user_ldap/tests/User_ProxyTest.php
+++ b/apps/user_ldap/tests/User_ProxyTest.php
@@ -49,7 +49,7 @@ class User_ProxyTest extends TestCase  {
 	/** @var UserPluginManager|\PHPUnit_Framework_MockObject_MockObject */
 	private $userPluginManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->ldapWrapper = $this->createMock(ILDAPWrapper::class);
diff --git a/apps/workflowengine/tests/Check/RequestUserAgentTest.php b/apps/workflowengine/tests/Check/RequestUserAgentTest.php
index 79e3de44874..7003441053d 100644
--- a/apps/workflowengine/tests/Check/RequestUserAgentTest.php
+++ b/apps/workflowengine/tests/Check/RequestUserAgentTest.php
@@ -34,7 +34,7 @@ class RequestUserAgentTest extends TestCase {
 	/** @var RequestUserAgent */
 	protected $check;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php
index f066eaba401..cbe6a816cd6 100644
--- a/tests/Core/Command/Apps/AppsDisableTest.php
+++ b/tests/Core/Command/Apps/AppsDisableTest.php
@@ -36,7 +36,7 @@ class AppsDisableTest extends TestCase {
 	/** @var CommandTester */
 	private $commandTester;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$command = new Disable(
diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php
index a30bef59326..6c137dca44b 100644
--- a/tests/Core/Command/Apps/AppsEnableTest.php
+++ b/tests/Core/Command/Apps/AppsEnableTest.php
@@ -36,7 +36,7 @@ class AppsEnableTest extends TestCase {
 	/** @var CommandTester */
 	private $commandTester;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$command = new Enable(
diff --git a/tests/Core/Command/Config/System/SetConfigTest.php b/tests/Core/Command/Config/System/SetConfigTest.php
index e3cfa89093d..9b34afed691 100644
--- a/tests/Core/Command/Config/System/SetConfigTest.php
+++ b/tests/Core/Command/Config/System/SetConfigTest.php
@@ -102,9 +102,10 @@ class SetConfigTest extends TestCase {
 
 	/**
 	 * @dataProvider setUpdateOnlyProvider
-	 * @expectedException \UnexpectedValueException
 	 */
 	public function testSetUpdateOnly($configNames, $existingData) {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$this->systemConfig->expects($this->never())
 			->method('setValue');
 		$this->systemConfig->method('getValue')
@@ -169,9 +170,10 @@ class SetConfigTest extends TestCase {
 
 	/**
 	 * @dataProvider castValueInvalidProvider
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testCastValueInvalid($value, $type) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->invokePrivate($this->command, 'castValue', [$value, $type]);
 	}
 
diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
index 0f56cf53fa8..d17050e7245 100644
--- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
+++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
@@ -63,7 +63,7 @@ class ChangeKeyStorageRootTest extends TestCase {
 	/** @var \OCP\UserInterface |  \PHPUnit_Framework_MockObject_MockObject */
 	protected $userInterface;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->getMockBuilder(View::class)->getMock();
@@ -181,12 +181,13 @@ class ChangeKeyStorageRootTest extends TestCase {
 
 	/**
 	 * @dataProvider dataTestPrepareNewRootException
-	 * @expectedException \Exception
 	 *
 	 * @param bool $dirExists
 	 * @param bool $couldCreateFile
 	 */
 	public function testPrepareNewRootException($dirExists, $couldCreateFile) {
+		$this->expectException(\Exception::class);
+
 		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
 			->willReturn($dirExists);
 		$this->view->expects($this->any())->method('file_put_contents')->willReturn($couldCreateFile);
@@ -370,10 +371,10 @@ class ChangeKeyStorageRootTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testTargetExistsException() {
+		$this->expectException(\Exception::class);
+
 		$this->view->expects($this->once())->method('file_exists')->with('path')
 			->willReturn(true);
 
diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php
index 7fa95351045..acdaff4bbab 100644
--- a/tests/Core/Command/Encryption/DecryptAllTest.php
+++ b/tests/Core/Command/Encryption/DecryptAllTest.php
@@ -54,7 +54,7 @@ class DecryptAllTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\DecryptAll */
 	protected $decryptAll;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)
@@ -181,10 +181,10 @@ class DecryptAllTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testExecuteFailure() {
+		$this->expectException(\Exception::class);
+
 		$instance = new DecryptAll(
 			$this->encryptionManager,
 			$this->appManager,
diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php
index 9c9818475f5..778d51fd8b8 100644
--- a/tests/Core/Command/Encryption/EncryptAllTest.php
+++ b/tests/Core/Command/Encryption/EncryptAllTest.php
@@ -128,10 +128,10 @@ class EncryptAllTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testExecuteException() {
+		$this->expectException(\Exception::class);
+
 		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
 		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(false);
 		$this->encryptionManager->expects($this->never())->method('getEncryptionModule');
diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php
index ea30a5d3d68..d4ba34246af 100644
--- a/tests/Core/Command/Group/AddTest.php
+++ b/tests/Core/Command/Group/AddTest.php
@@ -44,7 +44,7 @@ class AddTest extends TestCase {
 	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $output;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->groupManager = $this->createMock(IGroupManager::class);
diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php
index 85288d9e29c..1ee2d2d3377 100644
--- a/tests/Core/Command/Group/AddUserTest.php
+++ b/tests/Core/Command/Group/AddUserTest.php
@@ -49,7 +49,7 @@ class AddUserTest extends TestCase {
 	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $output;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->groupManager = $this->createMock(IGroupManager::class);
diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php
index 4c2acbbad94..69bdae99d63 100644
--- a/tests/Core/Command/Group/DeleteTest.php
+++ b/tests/Core/Command/Group/DeleteTest.php
@@ -44,7 +44,7 @@ class DeleteTest extends TestCase {
 	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $output;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->groupManager = $this->createMock(IGroupManager::class);
diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php
index 71697d89401..21adb29924a 100644
--- a/tests/Core/Command/Group/ListCommandTest.php
+++ b/tests/Core/Command/Group/ListCommandTest.php
@@ -45,7 +45,7 @@ class ListCommandTest extends TestCase {
 	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $output;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->groupManager = $this->createMock(IGroupManager::class);
diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php
index 7e835f58478..eda4886da3b 100644
--- a/tests/Core/Command/Group/RemoveUserTest.php
+++ b/tests/Core/Command/Group/RemoveUserTest.php
@@ -49,7 +49,7 @@ class RemoveUserTest extends TestCase {
 	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
 	private $output;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->groupManager = $this->createMock(IGroupManager::class);
diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/Core/Command/Log/ManageTest.php
index 92907948fb2..d73bc7ed9c2 100644
--- a/tests/Core/Command/Log/ManageTest.php
+++ b/tests/Core/Command/Log/ManageTest.php
@@ -87,17 +87,17 @@ class ManageTest extends TestCase {
 		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testValidateBackend() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		self::invokePrivate($this->command, 'validateBackend', ['notabackend']);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testValidateTimezone() {
+		$this->expectException(\Exception::class);
+
 		// this might need to be changed when humanity colonises Mars
 		self::invokePrivate($this->command, 'validateTimezone', ['Mars/OlympusMons']);
 	}
@@ -123,10 +123,10 @@ class ManageTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testConvertLevelStringInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		self::invokePrivate($this->command, 'convertLevelString', ['abc']);
 	}
 
@@ -149,10 +149,10 @@ class ManageTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testConvertLevelNumberInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		self::invokePrivate($this->command, 'convertLevelNumber', [11]);
 	}
 
diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/Core/Command/TwoFactorAuth/DisableTest.php
index 9741f5b2b52..fc0def50b90 100644
--- a/tests/Core/Command/TwoFactorAuth/DisableTest.php
+++ b/tests/Core/Command/TwoFactorAuth/DisableTest.php
@@ -45,7 +45,7 @@ class DisableTest extends TestCase {
 	/** @var CommandTester */
 	private $command;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->providerManager = $this->createMock(ProviderManager::class);
diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/Core/Command/TwoFactorAuth/EnableTest.php
index bd74bde2e81..faf00ed1ded 100644
--- a/tests/Core/Command/TwoFactorAuth/EnableTest.php
+++ b/tests/Core/Command/TwoFactorAuth/EnableTest.php
@@ -45,7 +45,7 @@ class EnableTest extends TestCase {
 	/** @var CommandTester */
 	private $command;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->providerManager = $this->createMock(ProviderManager::class);
diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php
index 00a4dd2b5fa..ceccf912285 100644
--- a/tests/Core/Controller/AppPasswordControllerTest.php
+++ b/tests/Core/Controller/AppPasswordControllerTest.php
@@ -64,7 +64,7 @@ class AppPasswordControllerTest extends TestCase {
 	/** @var AppPasswordController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->session = $this->createMock(ISession::class);
diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index d7feec28fd2..9135a6bc92f 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -121,7 +121,7 @@ class AvatarControllerTest extends \Test\TestCase {
 		$this->avatarFile->method('getEtag')->willReturn('my etag');
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 	}
 
diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php
index ac9d9d37993..a55b0bc232e 100644
--- a/tests/Core/Controller/ChangePasswordControllerTest.php
+++ b/tests/Core/Controller/ChangePasswordControllerTest.php
@@ -49,7 +49,7 @@ class ChangePasswordControllerTest extends \Test\TestCase {
 	/** @var ChangePasswordController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(\OC\User\Manager::class);
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php
index ebe43ba560f..3932cb9e144 100644
--- a/tests/Core/Controller/ClientFlowLoginControllerTest.php
+++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php
@@ -74,7 +74,7 @@ class ClientFlowLoginControllerTest extends TestCase {
 	/** @var ClientFlowLoginController */
 	private $clientFlowLoginController;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
index d8ce67b18f1..3c39a402f55 100644
--- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
+++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
@@ -58,7 +58,7 @@ class ClientFlowLoginV2ControllerTest extends TestCase {
 	/** @var ClientFlowLoginV2Controller */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php
index edee29cee57..c0d1ea42f41 100644
--- a/tests/Core/Controller/CssControllerTest.php
+++ b/tests/Core/Controller/CssControllerTest.php
@@ -48,7 +48,7 @@ class CssControllerTest extends TestCase {
 	/** @var CssController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php
index 503e97d1c53..26df6d181ef 100644
--- a/tests/Core/Controller/JsControllerTest.php
+++ b/tests/Core/Controller/JsControllerTest.php
@@ -48,7 +48,7 @@ class JsControllerTest extends TestCase {
 	/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
 	private $request;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 6a8db74b0d3..b4f3663c0ba 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -83,7 +83,7 @@ class LoginControllerTest extends TestCase {
 	/** @var IInitialStateService|MockObject */
 	private $initialStateService;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->request = $this->createMock(IRequest::class);
 		$this->userManager = $this->createMock(\OC\User\Manager::class);
diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php
index ce77d1d0684..4a4ad4b49e3 100644
--- a/tests/Core/Controller/NavigationControllerTest.php
+++ b/tests/Core/Controller/NavigationControllerTest.php
@@ -45,7 +45,7 @@ class NavigationControllerTest extends TestCase {
 	/** @var NavigationController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
index d1e7f2c4350..f0fbce86b8c 100644
--- a/tests/Core/Controller/OCSControllerTest.php
+++ b/tests/Core/Controller/OCSControllerTest.php
@@ -48,7 +48,7 @@ class OCSControllerTest extends TestCase {
 	/** @var OCSController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php
index 145fb93f63a..65252561796 100644
--- a/tests/Core/Controller/PreviewControllerTest.php
+++ b/tests/Core/Controller/PreviewControllerTest.php
@@ -49,7 +49,7 @@ class PreviewControllerTest extends \Test\TestCase {
 	/** @var PreviewController|\PHPUnit_Framework_MockObject_MockObject */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php
index 489433f10b8..b5e43b2999d 100644
--- a/tests/Core/Controller/UserControllerTest.php
+++ b/tests/Core/Controller/UserControllerTest.php
@@ -38,7 +38,7 @@ class UserControllerTest extends TestCase {
 	/** @var UserController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/Core/Controller/WipeControllerTest.php
index ebbf6509009..73d16a63a6e 100644
--- a/tests/Core/Controller/WipeControllerTest.php
+++ b/tests/Core/Controller/WipeControllerTest.php
@@ -40,7 +40,7 @@ class WipeControllerTest extends TestCase {
 	/** @var WipeController */
 	private $controller;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->remoteWipe = $this->createMock(RemoteWipe::class);
diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
index 65db9733ab2..2198cc7d5b4 100644
--- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php
+++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
@@ -162,10 +162,10 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, 'index');
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\TwoFactorAuthRequiredException
-	 */
+	
 	public function testBeforeControllerTwoFactorAuthRequired() {
+		$this->expectException(\OC\Authentication\Exceptions\TwoFactorAuthRequiredException::class);
+
 		$user = $this->createMock(IUser::class);
 
 		$this->reflector->expects($this->once())
@@ -190,10 +190,10 @@ class TwoFactorMiddlewareTest extends TestCase {
 		$this->middleware->beforeController($this->controller, 'index');
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\UserAlreadyLoggedInException
-	 */
+	
 	public function testBeforeControllerUserAlreadyLoggedIn() {
+		$this->expectException(\OC\Authentication\Exceptions\UserAlreadyLoggedInException::class);
+
 		$user = $this->createMock(IUser::class);
 
 		$this->reflector
diff --git a/tests/lib/Accounts/AccountsManagerTest.php b/tests/lib/Accounts/AccountsManagerTest.php
index 3204eca8bbb..d727f05d1ef 100644
--- a/tests/lib/Accounts/AccountsManagerTest.php
+++ b/tests/lib/Accounts/AccountsManagerTest.php
@@ -51,7 +51,7 @@ class AccountsManagerTest extends TestCase {
 	/** @var string accounts table name */
 	private $table = 'accounts';
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')
 			->disableOriginalConstructor()->getMock();
@@ -59,7 +59,7 @@ class AccountsManagerTest extends TestCase {
 		$this->jobList = $this->getMockBuilder(IJobList::class)->getMock();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		$query = $this->connection->getQueryBuilder();
 		$query->delete($this->table)->execute();
diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php
index 1cffb1e265e..0d6ce3241d6 100644
--- a/tests/lib/Accounts/HooksTest.php
+++ b/tests/lib/Accounts/HooksTest.php
@@ -45,7 +45,7 @@ class HooksTest extends TestCase  {
 	/** @var  Hooks | \PHPUnit_Framework_MockObject_MockObject */
 	private $hooks;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(ILogger::class);
diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php
index fed4bceb6a7..b52b12a7e8c 100644
--- a/tests/lib/Activity/ManagerTest.php
+++ b/tests/lib/Activity/ManagerTest.php
@@ -75,10 +75,10 @@ class ManagerTest extends TestCase {
 		$this->assertNotEmpty($consumers);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetConsumersInvalidConsumer() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->activityManager->registerConsumer(function() {
 			return new \stdClass();
 		});
@@ -98,13 +98,14 @@ class ManagerTest extends TestCase {
 	}
 
 	/**
-	 * @expectedException \UnexpectedValueException
 	 * @dataProvider getUserFromTokenThrowInvalidTokenData
 	 *
 	 * @param string $token
 	 * @param array $users
 	 */
 	public function testGetUserFromTokenThrowInvalidToken($token, $users) {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$this->mockRSSToken($token, $token, $users);
 		self::invokePrivate($this->activityManager, 'getUserFromToken');
 	}
@@ -163,37 +164,37 @@ class ManagerTest extends TestCase {
 			->willReturn($mockUser);
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
+	
 	public function testPublishExceptionNoApp() {
+		$this->expectException(\BadMethodCallException::class);
+
 		$event = $this->activityManager->generateEvent();
 		$this->activityManager->publish($event);
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
+	
 	public function testPublishExceptionNoType() {
+		$this->expectException(\BadMethodCallException::class);
+
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('test');
 		$this->activityManager->publish($event);
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
+	
 	public function testPublishExceptionNoAffectedUser() {
+		$this->expectException(\BadMethodCallException::class);
+
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('test')
 			->setType('test_type');
 		$this->activityManager->publish($event);
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
+	
 	public function testPublishExceptionNoSubject() {
+		$this->expectException(\BadMethodCallException::class);
+
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('test')
 			->setType('test_type')
diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php
index f3d43ff4396..80ddcbbd354 100644
--- a/tests/lib/AllConfigTest.php
+++ b/tests/lib/AllConfigTest.php
@@ -137,17 +137,18 @@ class AllConfigTest extends \Test\TestCase {
 	/**
 	 * @dataProvider dataSetUserValueUnexpectedValue
 	 * @param mixed $value
-	 * @expectedException \UnexpectedValueException
 	 */
 	public function testSetUserValueUnexpectedValue($value) {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$config = $this->getConfig();
 		$config->setUserValue('userSetBool', 'appSetBool', 'keySetBool', $value);
 	}
 
-	/**
-	 * @expectedException \OCP\PreConditionNotMetException
-	 */
+	
 	public function testSetUserValueWithPreConditionFailure() {
+		$this->expectException(\OCP\PreConditionNotMetException::class);
+
 		$config = $this->getConfig();
 
 		$selectAllSQL = 'SELECT `userid`, `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?';
diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php
index 0dc93174a67..b3437ad290c 100644
--- a/tests/lib/App/AppManagerTest.php
+++ b/tests/lib/App/AppManagerTest.php
@@ -248,10 +248,11 @@ class AppManagerTest extends TestCase {
 	 *
 	 * @param string $type
 	 *
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage test can't be enabled for groups.
 	 */
 	public function testEnableAppForGroupsForbiddenTypes($type) {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('test can\'t be enabled for groups.');
+
 		$group1 = $this->createMock(IGroup::class);
 		$group1->method('getGID')
 			->willReturn('group1');
diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/lib/App/AppStore/Bundles/BundleBase.php
index 6b03940c9a9..2c566b0ea0a 100644
--- a/tests/lib/App/AppStore/Bundles/BundleBase.php
+++ b/tests/lib/App/AppStore/Bundles/BundleBase.php
@@ -37,7 +37,7 @@ abstract class BundleBase extends TestCase {
 	/** @var array */
 	protected $bundleAppIds;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->l10n->method('t')
diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
index 27384953d3f..f453fbcb59a 100644
--- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
+++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
@@ -36,7 +36,7 @@ class BundleFetcherTest extends TestCase {
 	/** @var BundleFetcher */
 	private $bundleFetcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l10n = $this->createMock(IL10N::class);
@@ -69,11 +69,11 @@ class BundleFetcherTest extends TestCase {
 		$this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 * @expectedExceptionMessage Bundle with specified identifier does not exist
-	 */
+	
 	public function testGetBundleByIdentifierWithException() {
+		$this->expectException(\BadMethodCallException::class);
+		$this->expectExceptionMessage('Bundle with specified identifier does not exist');
+
 		$this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
 	}
 
diff --git a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php
index 01a449c8093..2ace537b938 100644
--- a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles;
 use OC\App\AppStore\Bundles\CoreBundle;
 
 class CoreBundleTest extends BundleBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->bundle = new CoreBundle($this->l10n);
 		$this->bundleIdentifier = 'CoreBundle';
diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php
index e3da7f1f660..1c5d2a480e9 100644
--- a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles;
 use OC\App\AppStore\Bundles\EducationBundle;
 
 class EducationBundleTest extends BundleBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->bundle = new EducationBundle($this->l10n);
 		$this->bundleIdentifier = 'EducationBundle';
diff --git a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php
index 717c6151ed4..d24e8846f56 100644
--- a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles;
 use OC\App\AppStore\Bundles\EnterpriseBundle;
 
 class EnterpriseBundleTest extends BundleBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->bundle = new EnterpriseBundle($this->l10n);
 		$this->bundleIdentifier = 'EnterpriseBundle';
diff --git a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
index 547e6e84ec8..88391a6382f 100644
--- a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles;
 use OC\App\AppStore\Bundles\GroupwareBundle;
 
 class GroupwareBundleTest extends BundleBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->bundle = new GroupwareBundle($this->l10n);
 		$this->bundleIdentifier = 'GroupwareBundle';
diff --git a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php
index 7f0e0f49302..17b2974b7c7 100644
--- a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles;
 use OC\App\AppStore\Bundles\SocialSharingBundle;
 
 class SocialSharingBundleTest extends BundleBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->bundle = new SocialSharingBundle($this->l10n);
 		$this->bundleIdentifier = 'SocialSharingBundle';
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
index cf19b5aa355..9a118234049 100644
--- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -59,7 +59,7 @@ class AppFetcherTest extends TestCase  {
 EOD;
 
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		/** @var Factory|PHPUnit_Framework_MockObject_MockObject $factory */
diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
index 753a1bf88d3..8a82322b61c 100644
--- a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
@@ -24,7 +24,7 @@ namespace Test\App\AppStore\Fetcher;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 
 class CategoryFetcherTest extends FetcherBase {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->fileName = 'categories.json';
 		$this->endpoint = 'https://apps.nextcloud.com/api/v1/categories.json';
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
index 4f614d33101..84584e5432f 100644
--- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php
+++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -56,7 +56,7 @@ abstract class FetcherBase extends TestCase {
 	/** @var string */
 	protected $endpoint;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->appDataFactory = $this->createMock(Factory::class);
 		$this->appData = $this->createMock(AppData::class);
diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/lib/App/AppStore/Version/VersionParserTest.php
index ea30f40d821..327c8cac779 100644
--- a/tests/lib/App/AppStore/Version/VersionParserTest.php
+++ b/tests/lib/App/AppStore/Version/VersionParserTest.php
@@ -29,7 +29,7 @@ class VersionParserTest extends TestCase  {
 	/** @var VersionParser */
 	private $versionParser;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->versionParser = new VersionParser();
 	}
@@ -81,19 +81,19 @@ class VersionParserTest extends TestCase  {
 		$this->assertEquals($expected, $this->versionParser->getVersion($input));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Version cannot be parsed: BogusVersion
-	 */
+	
 	public function testGetVersionException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Version cannot be parsed: BogusVersion');
+
 		$this->versionParser->getVersion('BogusVersion');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Version cannot be parsed: >=8.2 <=9.1a
-	 */
+	
 	public function testGetVersionExceptionWithMultiple() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Version cannot be parsed: >=8.2 <=9.1a');
+
 		$this->versionParser->getVersion('>=8.2 <=9.1a');
 	}
 }
diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php
index d6848971a84..943b53eee64 100644
--- a/tests/lib/App/DependencyAnalyzerTest.php
+++ b/tests/lib/App/DependencyAnalyzerTest.php
@@ -26,7 +26,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/** @var DependencyAnalyzer */
 	private $analyser;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->platformMock = $this->getMockBuilder(Platform::class)
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php
index 87f8142d4b9..14114e8fad7 100644
--- a/tests/lib/AppConfigTest.php
+++ b/tests/lib/AppConfigTest.php
@@ -26,7 +26,7 @@ class AppConfigTest extends TestCase {
 
 	protected $originalConfig;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -111,7 +111,7 @@ class AppConfigTest extends TestCase {
 		])->execute();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$sql = $this->connection->getQueryBuilder();
 		$sql->delete('appconfig');
 		$sql->execute();
diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php
index d239cacf633..b1cb1ceab6f 100644
--- a/tests/lib/AppFramework/Controller/ControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ControllerTest.php
@@ -94,10 +94,10 @@ class ControllerTest extends \Test\TestCase {
 		$this->controller = new ChildController($this->app, $request);
 	}
 
-	/**
-	 * @expectedException \DomainException
-	 */
+	
 	public function testFormatResonseInvalidFormat() {
+		$this->expectException(\DomainException::class);
+
 		$this->controller->buildResponse(null, 'test');
 	}
 
diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php
index 3eb9f6eef51..c8ebda55a86 100644
--- a/tests/lib/AppFramework/Db/EntityTest.php
+++ b/tests/lib/AppFramework/Db/EntityTest.php
@@ -129,25 +129,25 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	/**
-	 * @expectedException \BadFunctionCallException
-	 */
+	
 	public function testCallShouldOnlyWorkForGetterSetter(){
+		$this->expectException(\BadFunctionCallException::class);
+
 		$this->entity->something();
 	}
 
 
-	/**
-	 * @expectedException \BadFunctionCallException
-	 */
+	
 	public function testGetterShouldFailIfAttributeNotDefined(){
+		$this->expectException(\BadFunctionCallException::class);
+
 		$this->entity->getTest();
 	}
 
-	/**
-	 * @expectedException \BadFunctionCallException
-	 */
+	
 	public function testSetterShouldFailIfAttributeNotDefined(){
+		$this->expectException(\BadFunctionCallException::class);
+
 		$this->entity->setTest();
 	}
 
@@ -245,10 +245,10 @@ class EntityTest extends \Test\TestCase {
 		$this->assertThat($entity->isAnotherBool(), new IsType(IsType::TYPE_BOOL));
 	}
 
-	/**
-	 * @expectedException BadFunctionCallException
-	 */
+	
 	public function testIsGetterShoudFailForOtherType() {
+		$this->expectException(\BadFunctionCallException::class);
+
 		$entity = new TestEntity();
 		$entity->setName('hello');
 		$this->assertThat($entity->isName(), new IsType(IsType::TYPE_BOOL));
diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php
index da4102396de..6fa0fe10d88 100644
--- a/tests/lib/AppFramework/Db/QBMapperTest.php
+++ b/tests/lib/AppFramework/Db/QBMapperTest.php
@@ -127,9 +127,7 @@ class QBMapperTest extends \Test\TestCase {
 		$this->mapper = new QBTestMapper($this->db);
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testInsertEntityParameterTypeMapping() {
 		$entity = new QBTestEntity();
 		$entity->setIntProp(123);
@@ -166,9 +164,7 @@ class QBMapperTest extends \Test\TestCase {
 		$this->mapper->insert($entity);
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testUpdateEntityParameterTypeMapping() {
 		$entity = new QBTestEntity();
 		$entity->setId(789);
@@ -214,9 +210,7 @@ class QBMapperTest extends \Test\TestCase {
 		$this->mapper->update($entity);
 	}
 
-	/**
-	 *
-	 */
+	
 	public function testGetParameterTypeForProperty() {
 		$entity = new QBTestEntity();
 
diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
index a0783474df3..669063f4d18 100644
--- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
+++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php
@@ -56,7 +56,7 @@ class DIIntergrationTests extends TestCase {
 	/** @var ServerContainer */
 	private $server;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = new ServerContainer();
diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
index 1f687b1f7cc..6acc21550d1 100644
--- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
@@ -21,7 +21,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	/** @var ContentSecurityPolicy */
 	private $contentSecurityPolicy;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->contentSecurityPolicy = new ContentSecurityPolicy();
 	}
diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
index 86de705a80c..c19caad23c7 100644
--- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
@@ -21,7 +21,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase {
 	/** @var EmptyContentSecurityPolicy */
 	private $contentSecurityPolicy;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->contentSecurityPolicy = new EmptyContentSecurityPolicy();
 	}
diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
index 0321d700cd7..1cebc9ef0f2 100644
--- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
+++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php
@@ -31,7 +31,7 @@ class EmptyFeaturePolicyTest extends \Test\TestCase {
 	/** @var EmptyFeaturePolicy */
 	private $policy;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->policy = new EmptyFeaturePolicy();
 	}
diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php
index 45d7ff0c558..af21457bf0a 100644
--- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php
+++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php
@@ -31,7 +31,7 @@ class FeaturePolicyTest extends \Test\TestCase {
 	/** @var EmptyFeaturePolicy */
 	private $policy;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->policy = new FeaturePolicy();
 	}
diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
index d7c8b384bf5..5ca7635614c 100644
--- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
+++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php
@@ -34,7 +34,7 @@ class FileDisplayResponseTest extends \Test\TestCase {
 	/** @var FileDisplayResponse */
 	private $response;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->file = $this->getMockBuilder('OCP\Files\File')
 			->getMock();
 
diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php
index 4981313c32a..95d2e2a0a4c 100644
--- a/tests/lib/AppFramework/Http/JSONResponseTest.php
+++ b/tests/lib/AppFramework/Http/JSONResponseTest.php
@@ -89,11 +89,11 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $this->json->render());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Could not json_encode due to invalid non UTF-8 characters in the array: array (
-	 */
+	
 	public function testRenderWithNonUtf8Encoding() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Could not json_encode due to invalid non UTF-8 characters in the array: array (');
+
 		$params = ['test' => hex2bin('e9')];
 		$this->json->setData($params);
 		$this->json->render();
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index 7ca09cf33da..000a05f7913 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -103,10 +103,10 @@ class RequestTest extends \Test\TestCase {
 	}
 
 
-	/**
-	 * @expectedException \RuntimeException
-	 */
+	
 	public function testImmutableArrayAccess() {
+		$this->expectException(\RuntimeException::class);
+
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
 			'method' => 'GET'
@@ -123,10 +123,10 @@ class RequestTest extends \Test\TestCase {
 		$request['nickname'] = 'Janey';
 	}
 
-	/**
-	 * @expectedException \RuntimeException
-	 */
+	
 	public function testImmutableMagicAccess() {
+		$this->expectException(\RuntimeException::class);
+
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
 			'method' => 'GET'
@@ -143,10 +143,10 @@ class RequestTest extends \Test\TestCase {
 		$request->{'nickname'} = 'Janey';
 	}
 
-	/**
-	 * @expectedException \LogicException
-	 */
+	
 	public function testGetTheMethodRight() {
+		$this->expectException(\LogicException::class);
+
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
 			'method' => 'GET',
@@ -1246,11 +1246,11 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('www.owncloud.org', self::invokePrivate($request, 'getOverwriteHost'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php')
-	 */
+	
 	public function testGetPathInfoNotProcessible() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')');
+
 		$request = new Request(
 			[
 				'server' => [
@@ -1267,11 +1267,11 @@ class RequestTest extends \Test\TestCase {
 		$request->getPathInfo();
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php')
-	 */
+	
 	public function testGetRawPathInfoNotProcessible() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')');
+
 		$request = new Request(
 			[
 				'server' => [
diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
index 3174971032b..8971fe4df06 100644
--- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php
@@ -47,7 +47,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase {
 	/** @var AdditionalScriptsMiddleware */
 	private $middleWare;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
index 6d464a66177..f6ce5c27b22 100644
--- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
@@ -40,7 +40,7 @@ class BruteForceMiddlewareTest extends TestCase {
 	/** @var BruteForceMiddleware */
 	private $bruteForceMiddleware;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->reflector = $this->createMock(ControllerMethodReflector::class);
diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
index e022770a8cf..1c12a4aa153 100644
--- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
@@ -102,9 +102,10 @@ class CORSMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @CORS
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException
 	 */
 	public function testCorsIgnoredIfWithCredentialsHeaderPresent() {
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class);
+
 		$request = new Request(
 			[
 				'server' => [
@@ -171,9 +172,10 @@ class CORSMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @CORS
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException
 	 */
 	public function testCORSShouldFailIfPasswordLoginIsForbidden() {
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class);
+
 		$request = new Request(
 			['server' => [
 				'PHP_AUTH_USER' => 'user',
@@ -196,9 +198,10 @@ class CORSMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @CORS
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException
 	 */
 	public function testCORSShouldNotAllowCookieAuth() {
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class);
+
 		$request = new Request(
 			['server' => [
 				'PHP_AUTH_USER' => 'user',
@@ -251,11 +254,11 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage A regular exception
-	 */
+	
 	public function testAfterExceptionWithRegularException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('A regular exception');
+
 		$request = new Request(
 			['server' => [
 				'PHP_AUTH_USER' => 'user',
diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
index 89e396fcee3..3a06531eefd 100644
--- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
@@ -45,7 +45,7 @@ class RateLimitingMiddlewareTest extends TestCase {
 	/** @var RateLimitingMiddleware */
 	private $rateLimitingMiddleware;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
@@ -229,11 +229,11 @@ class RateLimitingMiddlewareTest extends TestCase {
 		$this->rateLimitingMiddleware->beforeController($controller, 'testMethod');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage My test exception
-	 */
+	
 	public function testAfterExceptionWithOtherException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('My test exception');
+
 		/** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */
 		$controller = $this->createMock(Controller::class);
 
diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
index c30d2760886..6f3c3f32adc 100644
--- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
@@ -43,7 +43,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 	/** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */
 	private $reflector;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(Request::class);
diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
index 26d09af9003..ae0e6ff484d 100644
--- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@@ -256,9 +256,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @PublicPage
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException
 	 */
 	public function testCsrfCheck(){
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException::class);
+
 		$this->request->expects($this->once())
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
@@ -300,9 +301,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @PublicPage
-	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException
 	 */
 	public function testFailCsrfCheck(){
+		$this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException::class);
+
 		$this->request->expects($this->once())
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
@@ -317,9 +319,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 	/**
 	 * @PublicPage
 	 * @StrictCookieRequired
-	 * @expectedException \OC\Appframework\Middleware\Security\Exceptions\StrictCookieMissingException
 	 */
 	public function testStrictCookieRequiredCheck() {
+		$this->expectException(\OC\Appframework\Middleware\Security\Exceptions\StrictCookieMissingException::class);
+
 		$this->request->expects($this->never())
 			->method('passesCSRFCheck');
 		$this->request->expects($this->once())
diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php
index 559561a8ccd..1b7ab054a0f 100644
--- a/tests/lib/AppFramework/Routing/RoutingTest.php
+++ b/tests/lib/AppFramework/Routing/RoutingTest.php
@@ -122,11 +122,11 @@ class RoutingTest extends \Test\TestCase
 		$this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something');
 	}
 
-	/**
-	 * @expectedException \UnexpectedValueException
-	 */
+	
 	public function testSimpleRouteWithBrokenName()
 	{
+		$this->expectException(\UnexpectedValueException::class);
+
 		$routes = array('routes' => array(
 			array('name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
 		));
@@ -144,10 +144,10 @@ class RoutingTest extends \Test\TestCase
 		$config->register();
 	}
 
-	/**
-	 * @expectedException \UnexpectedValueException
-	 */
+	
 	public function testSimpleOCSRouteWithBrokenName() {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$routes = ['ocs' => [
 			['name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
 		]];
diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php
index cfd55d8d6d8..0341be14af9 100644
--- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php
+++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php
@@ -61,7 +61,7 @@ class SimpleContainerTest extends \Test\TestCase {
 
     private $container;
 
-    public function setUp(): void {
+    protected function setUp(): void {
         $this->container = new SimpleContainer();
     }
 
@@ -72,18 +72,18 @@ class SimpleContainerTest extends \Test\TestCase {
     }
 
 
-    /**
-     * @expectedException \OCP\AppFramework\QueryException
-     */
+    
     public function testNothingRegistered() {
+    	$this->expectException(\OCP\AppFramework\QueryException::class);
+
         $this->container->query('something really hard');
     }
 
 
-    /**
-     * @expectedException \OCP\AppFramework\QueryException
-     */
+    
     public function testNotAClass() {
+    	$this->expectException(\OCP\AppFramework\QueryException::class);
+
         $this->container->query('Test\AppFramework\Utility\TestInterface');
     }
 
@@ -189,10 +189,10 @@ class SimpleContainerTest extends \Test\TestCase {
         $this->assertEquals('abc', $this->container->query($query));
     }
 
-    /**
-     * @expectedException \OCP\AppFramework\QueryException
-     */
+    
     public function testConstructorComplexNoTestParameterFound() {
+    	$this->expectException(\OCP\AppFramework\QueryException::class);
+
         $object = $this->container->query(
             'Test\AppFramework\Utility\ClassComplexConstructor'
         );
diff --git a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php
index fb20558c95a..7060dc2a770 100644
--- a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php
+++ b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php
@@ -145,10 +145,10 @@ class DefaultTokenMapperTest extends TestCase {
 		$this->assertEquals($token, $dbToken);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetInvalidToken() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$token = 'thisisaninvalidtokenthatisnotinthedatabase';
 
 		$this->mapper->getToken($token);
@@ -175,17 +175,17 @@ class DefaultTokenMapperTest extends TestCase {
 		$this->assertEquals($token, $dbToken);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetTokenByIdNotFound() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$this->mapper->getTokenById(-1);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetInvalidTokenById() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$id = 42;
 
 		$this->mapper->getToken($id);
diff --git a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
index b90a9931937..b4e5e097847 100644
--- a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
+++ b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php
@@ -159,10 +159,10 @@ class DefaultTokenProviderTest extends TestCase {
 		$this->assertEquals('passme', $actual);
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\PasswordlessTokenException
-	 */
+	
 	public function testGetPasswordPasswordLessToken() {
+		$this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class);
+
 		$token = 'token1234';
 		$tk = new DefaultToken();
 		$tk->setPassword(null);
@@ -170,10 +170,10 @@ class DefaultTokenProviderTest extends TestCase {
 		$this->tokenProvider->getPassword($tk, $token);
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidTokenException
-	 */
+	
 	public function testGetPasswordDeletesInvalidToken() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
 		$token = 'token1234';
 		$tk = new DefaultToken();
 		$tk->setPassword('someencryptedvalue');
@@ -222,10 +222,10 @@ class DefaultTokenProviderTest extends TestCase {
 		$this->assertEquals('encryptedpassword', $token->getPassword());
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidTokenException
-	 */
+	
 	public function testSetPasswordInvalidToken() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
 		$token = $this->createMock(IToken::class);
 		$tokenId = 'token123';
 		$password = '123456';
diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
index b58001ee7bb..58340b905c0 100644
--- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
+++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
@@ -171,10 +171,10 @@ class PublicKeyTokenMapperTest extends TestCase {
 		$this->assertEquals($token, $dbToken);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetInvalidToken() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$token = 'thisisaninvalidtokenthatisnotinthedatabase';
 
 		$this->mapper->getToken($token);
@@ -203,17 +203,17 @@ class PublicKeyTokenMapperTest extends TestCase {
 		$this->assertEquals($token, $dbToken);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetTokenByIdNotFound() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$this->mapper->getTokenById(-1);
 	}
 
-	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
-	 */
+	
 	public function testGetInvalidTokenById() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$id = '42';
 
 		$this->mapper->getToken($id);
diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
index aecbd969ee1..3fa7a92bb9b 100644
--- a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
+++ b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
@@ -145,10 +145,10 @@ class PublicKeyTokenProviderTest extends TestCase {
 		$this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\PasswordlessTokenException
-	 */
+	
 	public function testGetPasswordPasswordLessToken() {
+		$this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class);
+
 		$token = 'token1234';
 		$tk = new PublicKeyToken();
 		$tk->setPassword(null);
@@ -156,10 +156,10 @@ class PublicKeyTokenProviderTest extends TestCase {
 		$this->tokenProvider->getPassword($tk, $token);
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidTokenException
-	 */
+	
 	public function testGetPasswordInvalidToken() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
 		$token = 'token';
 		$uid = 'user';
 		$user = 'User';
@@ -205,10 +205,10 @@ class PublicKeyTokenProviderTest extends TestCase {
 		$this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'token'));
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidTokenException
-	 */
+	
 	public function testSetPasswordInvalidToken() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
 		$token = $this->createMock(IToken::class);
 		$tokenId = 'token123';
 		$password = '123456';
diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
index 634ab97a8bf..f3762976837 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
@@ -52,11 +52,11 @@ class ProviderLoaderTest extends TestCase {
 		$this->loader = new ProviderLoader($this->appManager);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Could not load two-factor auth provider \OCA\MyFaulty2faApp\DoesNotExist
-	 */
+	
 	public function testFailHardIfProviderCanNotBeLoaded() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Could not load two-factor auth provider \\OCA\\MyFaulty2faApp\\DoesNotExist');
+
 		$this->appManager->expects($this->once())
 			->method('getEnabledAppsForUser')
 			->with($this->user)
diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php
index f776e244c27..e34d844c3a4 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php
@@ -59,10 +59,10 @@ class ProviderManagerTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidProviderException
-	 */
+	
 	public function testTryEnableInvalidProvider() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidProviderException::class);
+
 		$user = $this->createMock(IUser::class);
 		$this->providerManager->tryEnableProviderFor('none', $user);
 	}
@@ -105,10 +105,10 @@ class ProviderManagerTest extends TestCase {
 		$this->assertTrue($res);
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\InvalidProviderException
-	 */
+	
 	public function testTryDisableInvalidProvider() {
+		$this->expectException(\OC\Authentication\Exceptions\InvalidProviderException::class);
+
 		$user = $this->createMock(IUser::class);
 		$this->providerManager->tryDisableProviderFor('none', $user);
 	}
diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php
index 812802f8c5f..5351a1069fc 100644
--- a/tests/lib/Avatar/AvatarManagerTest.php
+++ b/tests/lib/Avatar/AvatarManagerTest.php
@@ -51,7 +51,7 @@ class AvatarManagerTest extends \Test\TestCase {
 	/** @var AvatarManager | \PHPUnit_Framework_MockObject_MockObject */
 	private $avatarManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(Manager::class);
@@ -69,11 +69,11 @@ class AvatarManagerTest extends \Test\TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage user does not exist
-	 */
+	
 	public function testGetAvatarInvalidUser() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('user does not exist');
+
 		$this->userManager
 			->expects($this->once())
 			->method('get')
diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php
index 19be534e0ef..ff6c63df2a8 100644
--- a/tests/lib/Avatar/UserAvatarTest.php
+++ b/tests/lib/Avatar/UserAvatarTest.php
@@ -31,7 +31,7 @@ class UserAvatarTest extends \Test\TestCase {
 	/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->folder = $this->createMock(SimpleFolder::class);
diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/lib/Cache/CappedMemoryCacheTest.php
index 3b8e5bd7fb0..00231004fe5 100644
--- a/tests/lib/Cache/CappedMemoryCacheTest.php
+++ b/tests/lib/Cache/CappedMemoryCacheTest.php
@@ -28,7 +28,7 @@ namespace Test\Cache;
  * @package Test\Cache
  */
 class CappedMemoryCacheTest extends TestCache {
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->instance = new \OC\Cache\CappedMemoryCache();
 	}
diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php
index f4222a83ef8..e7d519a7493 100644
--- a/tests/lib/CapabilitiesManagerTest.php
+++ b/tests/lib/CapabilitiesManagerTest.php
@@ -35,7 +35,7 @@ class CapabilitiesManagerTest extends TestCase {
 	/** @var ILogger */
 	private $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->logger = $this->getMockBuilder(ILogger::class)->getMock();
 		$this->manager = new CapabilitiesManager($this->logger);
@@ -81,10 +81,11 @@ class CapabilitiesManagerTest extends TestCase {
 
 	/**
 	 * Test that we need something that implents ICapability
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage The given Capability (Test\NoCapability) does not implement the ICapability interface
 	 */
 	public function testNoICapability() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('The given Capability (Test\\NoCapability) does not implement the ICapability interface');
+
 		$this->manager->registerCapability(function() {
 			return new NoCapability();
 		});
diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php
index d5a84e9b1b5..3d81134680a 100644
--- a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php
@@ -60,7 +60,7 @@ class GroupPluginTest extends TestCase {
 	/** @var  IUser|\PHPUnit_Framework_MockObject_MockObject */
 	protected $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php
index 40fee52f234..15dccf2c84c 100644
--- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php
@@ -55,7 +55,7 @@ class LookupPluginTest extends TestCase {
 	/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
 	protected $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userSession = $this->createMock(IUserSession::class);
diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
index af5cb7d3036..9cf308cd414 100644
--- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -59,7 +59,7 @@ class MailPluginTest extends TestCase {
 	/** @var  IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userSession;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index 03140ddc6eb..4ac2cc124ee 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -57,7 +57,7 @@ class RemotePluginTest extends TestCase {
 	/** @var  SearchResult */
 	protected $searchResult;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
@@ -137,9 +137,10 @@ class RemotePluginTest extends TestCase {
 	 * @dataProvider dataTestSplitUserRemoteError
 	 *
 	 * @param string $id
-	 * @expectedException \Exception
 	 */
 	public function testSplitUserRemoteError($id) {
+		$this->expectException(\Exception::class);
+
 		$this->instantiatePlugin();
 		$this->plugin->splitUserRemote($id);
 	}
diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php
index 717693e7592..43672345226 100644
--- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php
+++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php
@@ -39,7 +39,7 @@ class SearchResultTest extends TestCase {
 	/** @var  ISearch */
 	protected $search;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->container = $this->createMock(IContainer::class);
diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/lib/Collaboration/Collaborators/SearchTest.php
index 9116352ef19..284d8270c49 100644
--- a/tests/lib/Collaboration/Collaborators/SearchTest.php
+++ b/tests/lib/Collaboration/Collaborators/SearchTest.php
@@ -39,7 +39,7 @@ class SearchTest extends TestCase {
 	/** @var  ISearch */
 	protected $search;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->container = $this->createMock(IContainer::class);
diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php
index 57b9cbde856..3aeeaa3eecb 100644
--- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php
@@ -62,7 +62,7 @@ class UserPluginTest extends TestCase {
 	/** @var  IUser|\PHPUnit_Framework_MockObject_MockObject */
 	protected $user;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Command/AsyncBusTest.php b/tests/lib/Command/AsyncBusTest.php
index 59a80320f41..31f28bb88c9 100644
--- a/tests/lib/Command/AsyncBusTest.php
+++ b/tests/lib/Command/AsyncBusTest.php
@@ -89,7 +89,7 @@ abstract class AsyncBusTest extends TestCase {
 	 */
 	abstract protected function createBus();
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		self::$lastCommand = '';
 	}
 
diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php
index a28ed0fbed4..ea610a135d8 100644
--- a/tests/lib/Command/CronBusTest.php
+++ b/tests/lib/Command/CronBusTest.php
@@ -31,7 +31,7 @@ class CronBusTest extends AsyncBusTest {
 	private $jobList;
 
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = new DummyJobList();
diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php
index 689b046e24e..6fa86a2e855 100644
--- a/tests/lib/Command/Integrity/SignAppTest.php
+++ b/tests/lib/Command/Integrity/SignAppTest.php
@@ -39,7 +39,7 @@ class SignAppTest extends TestCase {
 	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->checker = $this->createMock(Checker::class);
 		$this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php
index 6f67b86f478..9bab016ec8f 100644
--- a/tests/lib/Command/Integrity/SignCoreTest.php
+++ b/tests/lib/Command/Integrity/SignCoreTest.php
@@ -36,7 +36,7 @@ class SignCoreTest extends TestCase {
 	/** @var SignCore */
 	private $signCore;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->checker = $this->createMock(Checker::class);
 		$this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
diff --git a/tests/lib/Comments/CommentTest.php b/tests/lib/Comments/CommentTest.php
index 27d75193bc7..bd58d3fb156 100644
--- a/tests/lib/Comments/CommentTest.php
+++ b/tests/lib/Comments/CommentTest.php
@@ -51,10 +51,10 @@ class CommentTest extends TestCase {
 		$this->assertSame($object['id'], $comment->getObjectId());
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\IllegalIDChangeException
-	 */
+	
 	public function testSetIdIllegalInput() {
+		$this->expectException(\OCP\Comments\IllegalIDChangeException::class);
+
 		$comment = new Comment();
 
 		$comment->setId('c23');
@@ -86,9 +86,10 @@ class CommentTest extends TestCase {
 
 	/**
 	 * @dataProvider simpleSetterProvider
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSimpleSetterInvalidInput($field, $input) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$comment = new Comment();
 		$setter = 'set' . $field;
 
@@ -110,18 +111,19 @@ class CommentTest extends TestCase {
 
 	/**
 	 * @dataProvider roleSetterProvider
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetRoleInvalidInput($role, $type, $id){
+		$this->expectException(\InvalidArgumentException::class);
+
 		$comment = new Comment();
 		$setter = 'set' . $role;
 		$comment->$setter($type, $id);
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\MessageTooLongException
-	 */
+	
 	public function testSetUberlongMessage() {
+		$this->expectException(\OCP\Comments\MessageTooLongException::class);
+
 		$comment = new Comment();
 		$msg = str_pad('', IComment::MAX_MESSAGE_LENGTH + 1, 'x');
 		$comment->setMessage($msg);
diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php
index 8b7bf50f95c..93cafc0f933 100644
--- a/tests/lib/Comments/ManagerTest.php
+++ b/tests/lib/Comments/ManagerTest.php
@@ -21,7 +21,7 @@ class ManagerTest extends TestCase {
 	/** @var IDBConnection */
 	private $connection;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -67,18 +67,18 @@ class ManagerTest extends TestCase {
 		return $factory->getManager();
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\NotFoundException
-	 */
+	
 	public function testGetCommentNotFound() {
+		$this->expectException(\OCP\Comments\NotFoundException::class);
+
 		$manager = $this->getManager();
 		$manager->get('22');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetCommentNotFoundInvalidInput() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 		$manager->get('unexisting22');
 	}
@@ -125,18 +125,18 @@ class ManagerTest extends TestCase {
 		$this->assertEquals($comment->getLatestChildDateTime(), $latestChildDT);
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\NotFoundException
-	 */
+	
 	public function testGetTreeNotFound() {
+		$this->expectException(\OCP\Comments\NotFoundException::class);
+
 		$manager = $this->getManager();
 		$manager->getTree('22');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetTreeNotFoundInvalidIpnut() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 		$manager->getTree('unexisting22');
 	}
@@ -411,13 +411,14 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @dataProvider invalidCreateArgsProvider
-	 * @expectedException \InvalidArgumentException
 	 * @param string $aType
 	 * @param string $aId
 	 * @param string $oType
 	 * @param string $oId
 	 */
 	public function testCreateCommentInvalidArguments($aType, $aId, $oType, $oId) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 		$manager->create($aType, $aId, $oType, $oId);
 	}
@@ -436,10 +437,10 @@ class ManagerTest extends TestCase {
 		$this->assertSame($comment->getObjectId(), $objectId);
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\NotFoundException
-	 */
+	
 	public function testDelete() {
+		$this->expectException(\OCP\Comments\NotFoundException::class);
+
 		$manager = $this->getManager();
 
 		$done = $manager->delete('404');
@@ -497,10 +498,10 @@ class ManagerTest extends TestCase {
 		$this->assertSame($comment->getMessage(), $loadedComment->getMessage());
 	}
 
-	/**
-	 * @expectedException \OCP\Comments\NotFoundException
-	 */
+	
 	public function testSaveUpdateException() {
+		$this->expectException(\OCP\Comments\NotFoundException::class);
+
 		$manager = $this->getManager();
 		$comment = new Comment();
 		$comment
@@ -516,10 +517,10 @@ class ManagerTest extends TestCase {
 		$manager->save($comment);
 	}
 
-	/**
-	 * @expectedException \UnexpectedValueException
-	 */
+	
 	public function testSaveIncomplete() {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$manager = $this->getManager();
 		$comment = new Comment();
 		$comment->setMessage('from no one to nothing');
@@ -562,11 +563,12 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @dataProvider invalidActorArgsProvider
-	 * @expectedException \InvalidArgumentException
 	 * @param string $type
 	 * @param string $id
 	 */
 	public function testDeleteReferencesOfActorInvalidInput($type, $id) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 		$manager->deleteReferencesOfActor($type, $id);
 	}
@@ -630,11 +632,12 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @dataProvider invalidObjectArgsProvider
-	 * @expectedException \InvalidArgumentException
 	 * @param string $type
 	 * @param string $id
 	 */
 	public function testDeleteCommentsAtObjectInvalidInput($type, $id) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 		$manager->deleteCommentsAtObject($type, $id);
 	}
@@ -797,10 +800,10 @@ class ManagerTest extends TestCase {
 		$this->assertSame('SOMBRERO', $manager->resolveDisplayName('galaxy', 'sombrero'));
 	}
 
-	/**
-	 * @expectedException \OutOfBoundsException
-	 */
+	
 	public function testRegisterResolverDuplicate() {
+		$this->expectException(\OutOfBoundsException::class);
+
 		$manager = $this->getManager();
 
 		$planetClosure = function ($name) {
@@ -810,10 +813,10 @@ class ManagerTest extends TestCase {
 		$manager->registerDisplayNameResolver('planet', $planetClosure);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testRegisterResolverInvalidType() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 
 		$planetClosure = function ($name) {
@@ -822,10 +825,10 @@ class ManagerTest extends TestCase {
 		$manager->registerDisplayNameResolver(1337, $planetClosure);
 	}
 
-	/**
-	 * @expectedException \OutOfBoundsException
-	 */
+	
 	public function testResolveDisplayNameUnregisteredType() {
+		$this->expectException(\OutOfBoundsException::class);
+
 		$manager = $this->getManager();
 
 		$planetClosure = function ($name) {
@@ -847,10 +850,10 @@ class ManagerTest extends TestCase {
 		$this->assertTrue(is_string($manager->resolveDisplayName('planet', 'neptune')));
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testResolveDisplayNameInvalidType() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$manager = $this->getManager();
 
 		$planetClosure = function () {
diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
index 6460ef20d0c..10584812c41 100644
--- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
+++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
@@ -115,10 +115,10 @@ class ActionProviderStoreTest extends TestCase {
 		$this->assertInstanceOf(EMailProvider::class, $providers[0]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 */
+	
 	public function testGetProvidersWithQueryException() {
+		$this->expectException(\Exception::class);
+
 		$user = $this->createMock(IUser::class);
 		$this->appManager->expects($this->once())
 			->method('getEnabledAppsForUser')
diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php
index 4683c53d339..607674d7a38 100644
--- a/tests/lib/DB/ConnectionTest.php
+++ b/tests/lib/DB/ConnectionTest.php
@@ -42,12 +42,12 @@ class ConnectionTest extends \Test\TestCase {
 		}
 	}
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->connection = \OC::$server->getDatabaseConnection();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		$this->connection->dropTable('table');
 	}
@@ -157,10 +157,10 @@ class ConnectionTest extends \Test\TestCase {
 		$this->assertEquals('bar', $this->getTextValueByIntergerField(1));
 	}
 
-	/**
-	 * @expectedException \OCP\PreConditionNotMetException
-	 */
+	
 	public function testSetValuesOverWritePreconditionFailed() {
+		$this->expectException(\OCP\PreConditionNotMetException::class);
+
 		$this->makeTestTable();
 		$this->connection->setValues('table', [
 			'integerfield' => 1
@@ -335,10 +335,10 @@ class ConnectionTest extends \Test\TestCase {
 		$this->assertEquals(0, $result);
 	}
 
-	/**
-	 * @expectedException \Doctrine\DBAL\Exception\UniqueConstraintViolationException
-	 */
+	
 	public function testUniqueConstraintViolating() {
+		$this->expectException(\Doctrine\DBAL\Exception\UniqueConstraintViolationException::class);
+
 		$this->makeTestTable();
 
 		$testQuery = 'INSERT INTO `*PREFIX*table` (`integerfield`, `textfield`) VALUES(?, ?)';
diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php
index 8f38b3addd0..58f775febb0 100644
--- a/tests/lib/DB/MigrationsTest.php
+++ b/tests/lib/DB/MigrationsTest.php
@@ -36,7 +36,7 @@ class MigrationsTest extends \Test\TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject | IDBConnection $db */
 	private $db;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->db = $this->createMock(Connection::class);
@@ -60,27 +60,27 @@ class MigrationsTest extends \Test\TestCase {
 		$this->assertEquals('test_oc_migrations', $this->migrationService->getMigrationsTableName());
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Version 20170130180000 is unknown.
-	 */
+	
 	public function testExecuteUnknownStep() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Version 20170130180000 is unknown.');
+
 		$this->migrationService->executeStep('20170130180000');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App not found
-	 */
+	
 	public function testUnknownApp() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App not found');
+
 		$migrationService = new MigrationService('unknown-bloody-app', $this->db);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Migration step 'X' is unknown
-	 */
+	
 	public function testExecuteStepWithUnknownClass() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Migration step \'X\' is unknown');
+
 		$this->migrationService = $this->getMockBuilder(MigrationService::class)
 			->setMethods(['findMigrations'])
 			->setConstructorArgs(['testing', $this->db])
@@ -375,10 +375,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongTableName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$table = $this->createMock(Table::class);
 		$table->expects($this->any())
 			->method('getName')
@@ -400,10 +400,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongPrimaryWithDefault() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$defaultName = 'PRIMARY';
 		if ($this->db->getDatabasePlatform() instanceof PostgreSqlPlatform) {
 			$defaultName = \str_repeat('a', 27) . '_' . \str_repeat('b', 30) . '_seq';
@@ -453,10 +453,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongPrimaryWithName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$index = $this->createMock(Index::class);
 		$index->expects($this->any())
 			->method('getName')
@@ -496,10 +496,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongColumnName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$column = $this->createMock(Column::class);
 		$column->expects($this->any())
 			->method('getName')
@@ -530,10 +530,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongIndexName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$index = $this->createMock(Index::class);
 		$index->expects($this->any())
 			->method('getName')
@@ -567,10 +567,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongForeignKeyName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$foreignKey = $this->createMock(ForeignKeyConstraint::class);
 		$foreignKey->expects($this->any())
 			->method('getName')
@@ -607,10 +607,10 @@ class MigrationsTest extends \Test\TestCase {
 		self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testEnsureOracleIdentifierLengthLimitTooLongSequenceName() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$sequence = $this->createMock(Sequence::class);
 		$sequence->expects($this->any())
 			->method('getName')
diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php
index ca778fd4e2f..e5cc28654e4 100644
--- a/tests/lib/DB/MigratorTest.php
+++ b/tests/lib/DB/MigratorTest.php
@@ -102,10 +102,10 @@ class MigratorTest extends \Test\TestCase {
 		return $this->connection->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver;
 	}
 
-	/**
-	 * @expectedException \OC\DB\MigrationException
-	 */
+	
 	public function testDuplicateKeyUpgrade() {
+		$this->expectException(\OC\DB\MigrationException::class);
+
 		if ($this->isSQLite()) {
 			$this->markTestSkipped('sqlite does not throw errors when creating a new key on existing data');
 		}
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index e9878d33d85..a9542e2d616 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -1152,7 +1152,7 @@ class QueryBuilderTest extends \Test\TestCase {
 		$actual = $qB->getLastInsertId();
 
 		$this->assertNotNull($actual);
-		$this->assertInternalType('int', $actual);
+		$this->assertIsInt($actual);
 		$this->assertEquals($this->connection->lastInsertId('*PREFIX*properties'), $actual);
 
 		$qB->delete('properties')
diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php
index f7f6f6633cd..6cd8b572fcd 100644
--- a/tests/lib/DateTimeFormatterTest.php
+++ b/tests/lib/DateTimeFormatterTest.php
@@ -175,10 +175,10 @@ class DateTimeFormatterTest extends TestCase {
 		$this->assertEquals($expected, (string) $this->formatter->formatDateTime($timestamp, 'long', 'long', $timeZone));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	function testFormatDateWithInvalidTZ() {
+		$this->expectException(\Exception::class);
+
 		$this->formatter->formatDate(1350129205, 'long', new \DateTimeZone('Mordor/Barad-dûr'));
 	}
 }
diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/lib/Diagnostics/EventLoggerTest.php
index 18009ea26fe..323ca5c20d7 100644
--- a/tests/lib/Diagnostics/EventLoggerTest.php
+++ b/tests/lib/Diagnostics/EventLoggerTest.php
@@ -29,7 +29,7 @@ class EventLoggerTest extends TestCase {
 	/** @var \OC\Diagnostics\EventLogger */
 	private $logger;
 	
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = new EventLogger();
diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/lib/Diagnostics/QueryLoggerTest.php
index 32c17064f1c..545a706c3cf 100644
--- a/tests/lib/Diagnostics/QueryLoggerTest.php
+++ b/tests/lib/Diagnostics/QueryLoggerTest.php
@@ -29,7 +29,7 @@ class QueryLoggerTest extends TestCase {
 	/** @var \OC\Diagnostics\QueryLogger */
 	private $logger;
 	
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = new QueryLogger();
diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index 75ea3f8ef53..e2c76db7ed9 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -67,7 +67,7 @@ class DecryptAllTest extends TestCase {
 	/** @var  DecryptAll */
 	protected $instance;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->getMockBuilder(IUserManager::class)
diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php
index 8e9e774347b..93987a8bb20 100644
--- a/tests/lib/Encryption/EncryptionWrapperTest.php
+++ b/tests/lib/Encryption/EncryptionWrapperTest.php
@@ -43,7 +43,7 @@ class EncryptionWrapperTest extends TestCase {
 	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */
 	private $arrayCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->arrayCache = $this->createMock(ArrayCache::class);
diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php
index 611044ba920..31936a4176b 100644
--- a/tests/lib/Encryption/Keys/StorageTest.php
+++ b/tests/lib/Encryption/Keys/StorageTest.php
@@ -42,7 +42,7 @@ class StorageTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->util = $this->getMockBuilder('OC\Encryption\Util')
diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php
index 0919bda36b0..6e18cd296a3 100644
--- a/tests/lib/Encryption/ManagerTest.php
+++ b/tests/lib/Encryption/ManagerTest.php
@@ -35,7 +35,7 @@ class ManagerTest extends TestCase {
 	/** @var ArrayCache|\PHPUnit_Framework_MockObject_MockObject */
 	private $arrayCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->logger = $this->createMock(ILogger::class);
@@ -81,10 +81,11 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @depends testModuleRegistration
-	 * @expectedException \OC\Encryption\Exceptions\ModuleAlreadyExistsException
-	 * @expectedExceptionMessage Id "ID0" already used by encryption module "TestDummyModule0"
 	 */
 	public function testModuleReRegistration($manager) {
+		$this->expectException(\OC\Encryption\Exceptions\ModuleAlreadyExistsException::class);
+		$this->expectExceptionMessage('Id "ID0" already used by encryption module "TestDummyModule0"');
+
 		$this->addNewEncryptionModule($manager, 0);
 	}
 
@@ -98,11 +99,11 @@ class ManagerTest extends TestCase {
 
 	}
 
-	/**
-	 * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
-	 * @expectedExceptionMessage Module with ID: unknown does not exist.
-	 */
+	
 	public function testGetEncryptionModuleUnknown() {
+		$this->expectException(\OC\Encryption\Exceptions\ModuleDoesNotExistsException::class);
+		$this->expectExceptionMessage('Module with ID: unknown does not exist.');
+
 		$this->config->expects($this->any())->method('getAppValue')->willReturn(true);
 		$this->addNewEncryptionModule($this->manager, 0);
 		$this->assertCount(1, $this->manager->getEncryptionModules());
diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php
index ee616d20793..e503da109a8 100644
--- a/tests/lib/Encryption/UtilTest.php
+++ b/tests/lib/Encryption/UtilTest.php
@@ -32,7 +32,7 @@ class UtilTest extends TestCase {
 	/** @var  \OC\Encryption\Util */
 	private $util;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
@@ -96,10 +96,10 @@ class UtilTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException
-	 */
+	
 	public function testCreateHeaderFailed() {
+		$this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
+
 
 		$header = array('header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo');
 
diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php
index bd62a8ac026..224acadbde4 100644
--- a/tests/lib/Federation/CloudIdManagerTest.php
+++ b/tests/lib/Federation/CloudIdManagerTest.php
@@ -71,9 +71,10 @@ class CloudIdManagerTest extends TestCase {
 	 *
 	 * @param string $cloudId
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testInvalidCloudId($cloudId) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->cloudIdManager->resolveCloudId($cloudId);
 	}
 
diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php
index 3932e308de0..1b3f705b9b6 100644
--- a/tests/lib/Files/AppData/AppDataTest.php
+++ b/tests/lib/Files/AppData/AppDataTest.php
@@ -42,7 +42,7 @@ class AppDataTest extends \Test\TestCase {
 	/** @var IAppData */
 	private $appData;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php
index ceed1f4ed3a..fec464d6e3a 100644
--- a/tests/lib/Files/AppData/FactoryTest.php
+++ b/tests/lib/Files/AppData/FactoryTest.php
@@ -37,7 +37,7 @@ class FactoryTest extends \Test\TestCase {
 	/** @var Factory */
 	private $factory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php
index bbf36329461..ce6b84ee4d0 100644
--- a/tests/lib/Files/Cache/PropagatorTest.php
+++ b/tests/lib/Files/Cache/PropagatorTest.php
@@ -20,7 +20,7 @@ class PropagatorTest extends TestCase {
 	/** @var  IStorage */
 	private $storage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage = new Temporary();
 		$this->storage->mkdir('foo/bar');
diff --git a/tests/lib/Files/Cache/QuerySearchHelperTest.php b/tests/lib/Files/Cache/QuerySearchHelperTest.php
index 5a9d3022099..d5aad09a8fb 100644
--- a/tests/lib/Files/Cache/QuerySearchHelperTest.php
+++ b/tests/lib/Files/Cache/QuerySearchHelperTest.php
@@ -48,7 +48,7 @@ class QuerySearchHelperTest extends TestCase {
 	/** @var  integer */
 	private $numericStorageId;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$this->mimetypeLoader = $this->createMock(IMimeTypeLoader::class);
@@ -83,7 +83,7 @@ class QuerySearchHelperTest extends TestCase {
 			->where($this->builder->expr()->eq('storage', new Literal($this->numericStorageId)));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 
 		$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php
index 1c0a8b0e0e9..6a025410cc3 100644
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@@ -250,8 +250,8 @@ class ScannerTest extends \Test\TestCase {
 		$this->cache->put('folder', array('mtime' => $this->storage->filemtime('folder'), 'storage_mtime' => $this->storage->filemtime('folder')));
 		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE);
 		$newData = $this->cache->get('');
-		$this->assertInternalType('string', $oldData['etag']);
-		$this->assertInternalType('string', $newData['etag']);
+		$this->assertIsString($oldData['etag']);
+		$this->assertIsString($newData['etag']);
 		$this->assertNotSame($oldData['etag'], $newData['etag']);
 		$this->assertEquals($oldData['size'], $newData['size']);
 
@@ -320,11 +320,11 @@ class ScannerTest extends \Test\TestCase {
 		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
 		/** @var CacheEntry $data0 */
 		$data0 = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $data0['etag']);
+		$this->assertIsString($data0['etag']);
 		$data1 = $this->cache->get('folder');
-		$this->assertInternalType('string', $data1['etag']);
+		$this->assertIsString($data1['etag']);
 		$data2 = $this->cache->get('');
-		$this->assertInternalType('string', $data2['etag']);
+		$this->assertIsString($data2['etag']);
 		$data0['etag'] = '';
 		$this->cache->put('folder/bar.txt', $data0->getData());
 
@@ -333,7 +333,7 @@ class ScannerTest extends \Test\TestCase {
 
 		// verify cache content
 		$newData0 = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $newData0['etag']);
+		$this->assertIsString($newData0['etag']);
 		$this->assertNotEmpty($newData0['etag']);
 	}
 
diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php
index e20cfe2ac12..a3b1a428c28 100644
--- a/tests/lib/Files/Cache/UpdaterLegacyTest.php
+++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php
@@ -93,13 +93,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		Filesystem::file_put_contents('foo.txt', 'asd');
 		$cachedData = $this->cache->get('foo.txt');
 		$this->assertEquals(3, $cachedData['size']);
-		$this->assertInternalType('string', $fooCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($fooCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$rootCachedData = $cachedData;
 
@@ -111,8 +111,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 2 * 3, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 	}
@@ -133,13 +133,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 	}
 
@@ -155,8 +155,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->assertFalse($this->cache->inCache('foo.txt'));
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 		$rootCachedData = $cachedData;
@@ -164,16 +164,16 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		Filesystem::mkdir('bar_folder');
 		$this->assertTrue($this->cache->inCache('bar_folder'));
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$rootCachedData = $cachedData;
 		$oldEtag = $rootCachedData['etag'];
 		Filesystem::rmdir('bar_folder');
 		$this->assertFalse($this->cache->inCache('bar_folder'));
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 	}
@@ -192,14 +192,14 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->assertFalse($cache2->inCache('foo.txt'));
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($substorageCachedData, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
 	}
@@ -221,8 +221,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 	}
 
@@ -253,15 +253,15 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		// rename can cause mtime change - invalid assert
 //		$this->assertEquals($mtime, $cachedData['mtime']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		// rename can cause mtime change - invalid assert
 //		$this->assertEquals($mtime, $cachedData['mtime']);
@@ -272,13 +272,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$fooCachedData = $this->cache->get('foo.txt');
 		Filesystem::touch('foo.txt');
 		$cachedData = $this->cache->get('foo.txt');
-		$this->assertInternalType('string', $fooCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($fooCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
 
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 		$rootCachedData = $cachedData;
@@ -289,19 +289,19 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->cache->put('', ['mtime' => $time - 100]);
 		Filesystem::touch('folder/bar.txt', $time);
 		$cachedData = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $barCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($barCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($barCachedData['etag'], $cachedData['etag']);
 		$this->assertEquals($time, $cachedData['mtime']);
 
 		$cachedData = $this->cache->get('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
 
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertEquals($time, $cachedData['mtime']);
 	}
diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
index 744e132d2cc..9c1a8c14101 100644
--- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
+++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
@@ -24,7 +24,7 @@ class CacheJailTest extends CacheTest {
 	 */
 	protected $sourceCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage->mkdir('foo');
 		$this->sourceCache = $this->cache;
diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
index 0e2460f74e2..9883fc1da27 100644
--- a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
+++ b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
@@ -24,7 +24,7 @@ class CachePermissionsMaskTest extends CacheTest {
 	 */
 	protected $sourceCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage->mkdir('foo');
 		$this->sourceCache = $this->cache;
diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php
index ba1011aa68e..d63693a655b 100644
--- a/tests/lib/Files/Config/UserMountCacheTest.php
+++ b/tests/lib/Files/Config/UserMountCacheTest.php
@@ -42,7 +42,7 @@ class UserMountCacheTest extends TestCase {
 
 	private $fileIds = [];
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->fileIds = [];
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->userManager = new Manager($this->createMock(IConfig::class), $this->createMock(EventDispatcherInterface::class));
@@ -54,7 +54,7 @@ class UserMountCacheTest extends TestCase {
 		$this->cache = new \OC\Files\Config\UserMountCache($this->connection, $this->userManager, $this->createMock(Log::class));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$builder = $this->connection->getQueryBuilder();
 
 		$builder->delete('mounts')->execute();
diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php
index 5c7c5cdc361..0037941b629 100644
--- a/tests/lib/Files/FileInfoTest.php
+++ b/tests/lib/Files/FileInfoTest.php
@@ -23,7 +23,7 @@ class FileInfoTest extends TestCase {
 
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->createUser('foo', 'foo');
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index 6b6e3feda33..6d0362772ca 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -323,18 +323,19 @@ class FilesystemTest extends \Test\TestCase {
 	/**
 	 * Tests that an exception is thrown when passed user does not exist.
 	 *
-	 * @expectedException \OC\User\NoUserException
 	 */
 	public function testLocalMountWhenUserDoesNotExist() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		$userId = $this->getUniqueID('user_');
 
 		\OC\Files\Filesystem::initMountPoints($userId);
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 */
+	
 	public function testNullUserThrows() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		\OC\Files\Filesystem::initMountPoints(null);
 	}
 
diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
index 5cd517df3c9..278872b8728 100644
--- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
+++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
@@ -21,7 +21,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
 	/** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */
 	protected $loader;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php
index a17cc1d1a3a..2cdf9cbdc5a 100644
--- a/tests/lib/Files/Node/FileTest.php
+++ b/tests/lib/Files/Node/FileTest.php
@@ -59,10 +59,10 @@ class FileTest extends NodeTest {
 		$this->assertEquals('bar', $node->getContent());
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testGetContentNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
 			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
@@ -105,10 +105,10 @@ class FileTest extends NodeTest {
 		$node->putContent('bar');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testPutContentNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
 			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
@@ -213,10 +213,10 @@ class FileTest extends NodeTest {
 		$this->assertEquals(2, $hooksCalled);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			$this->view,
@@ -238,10 +238,10 @@ class FileTest extends NodeTest {
 		$node->fopen('r');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadWriteNoReadPermissions() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			$this->view,
@@ -263,10 +263,10 @@ class FileTest extends NodeTest {
 		$node->fopen('w');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadWriteNoWritePermissions() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			new $this->view,
diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
index 3390d19feb7..d33fb4f68f8 100644
--- a/tests/lib/Files/Node/FolderTest.php
+++ b/tests/lib/Files/Node/FolderTest.php
@@ -176,10 +176,10 @@ class FolderTest extends NodeTest {
 		$this->assertEquals($child, $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testNewFolderNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$manager = $this->createMock(Manager::class);
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
@@ -230,10 +230,10 @@ class FolderTest extends NodeTest {
 		$this->assertEquals($child, $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testNewFileNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$manager = $this->createMock(Manager::class);
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php
index 9c47df02f3b..4c747a562b8 100644
--- a/tests/lib/Files/Node/HookConnectorTest.php
+++ b/tests/lib/Files/Node/HookConnectorTest.php
@@ -53,7 +53,7 @@ class HookConnectorTest extends TestCase {
 	 */
 	private $userId;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->userId = $this->getUniqueID();
 		$this->createUser($this->userId, 'pass');
@@ -71,7 +71,7 @@ class HookConnectorTest extends TestCase {
 		$this->eventDispatcher = \OC::$server->getEventDispatcher();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		\OC_Hook::clear('OC_Filesystem');
 		\OC_Util::tearDownFS();
diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php
index 14ae0b0ead3..7c8ddee6b5f 100644
--- a/tests/lib/Files/Node/NodeTest.php
+++ b/tests/lib/Files/Node/NodeTest.php
@@ -180,10 +180,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(2, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testDeleteNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->root->expects($this->any())
 			->method('getUser')
 			->will($this->returnValue($this->user));
@@ -437,10 +437,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(2, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testTouchNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->root->expects($this->any())
 			->method('getUser')
 			->will($this->returnValue($this->user));
@@ -454,10 +454,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->touch(100);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\InvalidPathException
-	 */
+	
 	public function testInvalidPath() {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+
 		$node = $this->createTestNode($this->root, $this->view, '/../foo');
 		$node->getFileInfo();
 	}
@@ -488,10 +488,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(3, $target->getId());
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
 		 */
@@ -519,10 +519,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->copy('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testCopyNoParent() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$this->view->expects($this->never())
 			->method('copy');
 
@@ -536,10 +536,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->copy('/bar/asd/foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyParentIsFile() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->never())
 			->method('copy');
 
@@ -659,10 +659,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(4, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('getFileInfo')
 			->will($this->returnValue($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ])));
@@ -681,10 +681,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testMoveNoParent() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
 		 */
@@ -703,10 +703,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveParentIsFile() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->never())
 			->method('rename');
 
@@ -721,10 +721,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveFailed() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('rename')
 			->with('/bar/foo', '/bar/asd')
@@ -744,10 +744,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyFailed() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('copy')
 			->with('/bar/foo', '/bar/asd')
diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php
index 70ffe1b25c4..5067236ec58 100644
--- a/tests/lib/Files/Node/RootTest.php
+++ b/tests/lib/Files/Node/RootTest.php
@@ -87,10 +87,10 @@ class RootTest extends \Test\TestCase {
 		$this->assertInstanceOf('\OC\Files\Node\File', $node);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetNotFound() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
 		 */
@@ -121,10 +121,10 @@ class RootTest extends \Test\TestCase {
 		$root->get('/bar/foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testGetInvalidPath() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
 		 */
@@ -143,10 +143,10 @@ class RootTest extends \Test\TestCase {
 		$root->get('/../foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetNoStorages() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
 		 */
@@ -201,11 +201,11 @@ class RootTest extends \Test\TestCase {
 		$this->assertEquals($folder, $root->getUserFolder('MyUserId'));
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 * @expectedExceptionMessage Backends provided no user object
-	 */
+	
 	public function testGetUserFolderWithNoUserObj() {
+		$this->expectException(\OC\User\NoUserException::class);
+		$this->expectExceptionMessage('Backends provided no user object');
+
 		$root = new \OC\Files\Node\Root(
 			$this->createMock(Manager::class),
 			$this->createMock(View::class),
diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php
index 02ea3df6cb6..18637daf9d7 100644
--- a/tests/lib/Files/PathVerificationTest.php
+++ b/tests/lib/Files/PathVerificationTest.php
@@ -30,11 +30,11 @@ class PathVerificationTest extends \Test\TestCase {
 		$this->view = new View();
 	}
 
-	/**
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage File name is too long
-	 */
+	
 	public function testPathVerificationFileNameTooLong() {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('File name is too long');
+
 		$fileName = str_repeat('a', 500);
 		$this->view->verifyPath('', $fileName);
 	}
@@ -42,10 +42,11 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesEmptyFiles
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage Empty filename is not allowed
 	 */
 	public function testPathVerificationEmptyFileName($fileName) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('Empty filename is not allowed');
+
 		$this->view->verifyPath('', $fileName);
 	}
 
@@ -58,10 +59,11 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesDotFiles
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage Dot files are not allowed
 	 */
 	public function testPathVerificationDotFiles($fileName) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('Dot files are not allowed');
+
 		$this->view->verifyPath('', $fileName);
 	}
 
@@ -107,9 +109,10 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesInvalidCharsPosix
-	 * @expectedException \OCP\Files\InvalidCharacterInPathException
 	 */
 	public function testPathVerificationInvalidCharsPosix($fileName) {
+		$this->expectException(\OCP\Files\InvalidCharacterInPathException::class);
+
 		$storage = new Local(['datadir' => '']);
 
 		$fileName = " 123{$fileName}456 ";
diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php
index ba8688fea01..07a7e79c7a3 100644
--- a/tests/lib/Files/SimpleFS/SimpleFileTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php
@@ -36,7 +36,7 @@ class SimpleFileTest extends \Test\TestCase  {
 	/** @var SimpleFile */
 	private $simpleFile;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->file = $this->createMock(File::class);
diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
index 9c55367f44f..9dcca32090f 100644
--- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
@@ -37,7 +37,7 @@ class SimpleFolderTest extends \Test\TestCase  {
 	/** @var SimpleFolder */
 	private $simpleFolder;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->folder = $this->createMock(Folder::class);
diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php
index 3b83a349cfa..23738a25c2a 100644
--- a/tests/lib/Files/Storage/LocalTest.php
+++ b/tests/lib/Files/Storage/LocalTest.php
@@ -63,24 +63,24 @@ class LocalTest extends Storage {
 		$this->assertNotEquals($etag1, $etag2);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testInvalidArgumentsEmptyArray() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new \OC\Files\Storage\Local([]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testInvalidArgumentsNoArray() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new \OC\Files\Storage\Local(null);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\ForbiddenException
-	 */
+	
 	public function testDisallowSymlinksOutsideDatadir() {
+		$this->expectException(\OCP\Files\ForbiddenException::class);
+
 		$subDir1 = $this->tmpDir . 'sub1';
 		$subDir2 = $this->tmpDir . 'sub2';
 		$sym = $this->tmpDir . 'sub1/sym';
diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
index e8eb49ec014..f36958ad552 100644
--- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
+++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
@@ -35,7 +35,7 @@ class AvailabilityTest extends \Test\TestCase {
 	/** @var Availability  */
 	protected $wrapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->storageCache = $this->createMock(StorageCache::class);
@@ -66,9 +66,10 @@ class AvailabilityTest extends \Test\TestCase {
 	/**
 	 * Storage marked unavailable, TTL not expired
 	 *
-	 * @expectedException \OCP\Files\StorageNotAvailableException
 	 */
 	public function testUnavailable() {
+		$this->expectException(\OCP\Files\StorageNotAvailableException::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => false, 'last_checked' => time()]);
@@ -105,9 +106,10 @@ class AvailabilityTest extends \Test\TestCase {
 	/**
 	 * Storage marked available, but throws StorageNotAvailableException
 	 *
-	 * @expectedException \OCP\Files\StorageNotAvailableException
 	 */
 	public function testAvailableThrowStorageNotAvailable() {
+		$this->expectException(\OCP\Files\StorageNotAvailableException::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => true, 'last_checked' => 0]);
@@ -146,9 +148,10 @@ class AvailabilityTest extends \Test\TestCase {
 	 * Storage available, but throws exception
 	 * Standard exception does not indicate storage unavailability
 	 *
-	 * @expectedException \Exception
 	 */
 	public function testAvailableThrow() {
+		$this->expectException(\Exception::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => true, 'last_checked' => 0]);
diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
index 5b4443eecfc..9060ca2dac3 100644
--- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
@@ -18,7 +18,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary([]);
 		$this->instance = new \OC\Files\Storage\Wrapper\Encoding([
@@ -26,7 +26,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
 		]);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->sourceStorage->cleanUp();
 		parent::tearDown();
 	}
diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php
index 1091809f96c..cb7003cb7ea 100644
--- a/tests/lib/Files/Storage/Wrapper/JailTest.php
+++ b/tests/lib/Files/Storage/Wrapper/JailTest.php
@@ -15,7 +15,7 @@ class JailTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
 		$this->sourceStorage->mkdir('foo');
@@ -25,7 +25,7 @@ class JailTest extends \Test\Files\Storage\Storage {
 		));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		// test that nothing outside our jail is touched
 		$contents = array();
 		$dh = $this->sourceStorage->opendir('');
diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
index c9545ae3f28..bfdd3d3ddbb 100644
--- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
+++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
@@ -22,13 +22,13 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
 		$this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->sourceStorage->cleanUp();
 		parent::tearDown();
 	}
diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php
index c0cd2a24411..e522239f001 100644
--- a/tests/lib/Files/Type/DetectionTest.php
+++ b/tests/lib/Files/Type/DetectionTest.php
@@ -28,7 +28,7 @@ class DetectionTest extends \Test\TestCase {
 	/** @var Detection */
 	private $detection;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->detection = new Detection(
 			\OC::$server->getURLGenerator(),
diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index 9f057960b60..4af252735f6 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -157,11 +157,12 @@ class ScannerTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider invalidPathProvider
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Invalid path to scan
 	 * @param string $invalidPath
 	 */
 	public function testInvalidPathScanning($invalidPath) {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid path to scan');
+
 		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
 		$scanner->scan($invalidPath);
 	}
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 1e564c69092..57050059375 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -242,10 +242,10 @@ class ViewTest extends \Test\TestCase {
 		$this->assertEquals('/foo.txt', $folderView->getPath($id2));
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetPathNotExisting() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$storage1 = $this->getTestStorage();
 		Filesystem::mount($storage1, [], '/');
 
@@ -1049,9 +1049,10 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider tooLongPathDataProvider
-	 * @expectedException \OCP\Files\InvalidPathException
 	 */
 	public function testTooLongPath($operation, $param0 = null) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+
 
 		$longPath = '';
 		// 4000 is the maximum path length in file_cache.path
@@ -1242,10 +1243,11 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider directoryTraversalProvider
-	 * @expectedException \Exception
 	 * @param string $root
 	 */
 	public function testConstructDirectoryTraversalException($root) {
+		$this->expectException(\Exception::class);
+
 		new View($root);
 	}
 
@@ -1289,17 +1291,16 @@ class ViewTest extends \Test\TestCase {
 		$this->assertNull($view->getRelativePath(null));
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testNullAsRoot() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new View(null);
 	}
 
 	/**
 	 * e.g. reading from a folder that's being renamed
 	 *
-	 * @expectedException \OCP\Lock\LockedException
 	 *
 	 * @dataProvider dataLockPaths
 	 *
@@ -1307,6 +1308,8 @@ class ViewTest extends \Test\TestCase {
 	 * @param string $pathPrefix
 	 */
 	public function testReadFromWriteLockedPath($rootPath, $pathPrefix) {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$rootPath = str_replace('{folder}', 'files', $rootPath);
 		$pathPrefix = str_replace('{folder}', 'files', $pathPrefix);
 
@@ -1339,7 +1342,6 @@ class ViewTest extends \Test\TestCase {
 	/**
 	 * e.g. writing a file that's being downloaded
 	 *
-	 * @expectedException \OCP\Lock\LockedException
 	 *
 	 * @dataProvider dataLockPaths
 	 *
@@ -1347,6 +1349,8 @@ class ViewTest extends \Test\TestCase {
 	 * @param string $pathPrefix
 	 */
 	public function testWriteToReadLockedFile($rootPath, $pathPrefix) {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$rootPath = str_replace('{folder}', 'files', $rootPath);
 		$pathPrefix = str_replace('{folder}', 'files', $pathPrefix);
 
@@ -1507,11 +1511,12 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider pathRelativeToFilesProviderExceptionCases
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage $absolutePath must be relative to "files"
 	 * @param string $path
 	 */
 	public function testGetPathRelativeToFilesWithInvalidArgument($path) {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('$absolutePath must be relative to "files"');
+
 		$view = new View();
 		$view->getPathRelativeToFiles($path);
 	}
@@ -2141,9 +2146,10 @@ class ViewTest extends \Test\TestCase {
 	 * simulate a failed copy operation.
 	 * We expect that we catch the exception, free the lock and re-throw it.
 	 *
-	 * @expectedException \Exception
 	 */
 	public function testLockFileCopyException() {
+		$this->expectException(\Exception::class);
+
 		$view = new View('/' . $this->user . '/files/');
 
 		/** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */
diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php
index 4ceb34dc02f..5aaed1ed5bd 100644
--- a/tests/lib/GlobalScale/ConfigTest.php
+++ b/tests/lib/GlobalScale/ConfigTest.php
@@ -31,7 +31,7 @@ class ConfigTest extends TestCase {
 	/** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php
index 1a240d5bc98..61e4b39c8f3 100644
--- a/tests/lib/Group/GroupTest.php
+++ b/tests/lib/Group/GroupTest.php
@@ -21,7 +21,7 @@ class GroupTest extends \Test\TestCase {
 	/** @var EventDispatcherInterface|MockObject */
 	protected $dispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
 	}
diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php
index 86665ee0879..d5f8baa3fa1 100644
--- a/tests/lib/Group/ManagerTest.php
+++ b/tests/lib/Group/ManagerTest.php
@@ -409,7 +409,7 @@ class ManagerTest extends TestCase {
 		$this->assertCount(2, $groups);
 
 		foreach ($groups as $group) {
-			$this->assertInternalType('string', $group);
+			$this->assertIsString($group);
 		}
 	}
 
diff --git a/tests/lib/Group/MetaDataTest.php b/tests/lib/Group/MetaDataTest.php
index c53a7eb2adf..4332a6f036f 100644
--- a/tests/lib/Group/MetaDataTest.php
+++ b/tests/lib/Group/MetaDataTest.php
@@ -34,7 +34,7 @@ class MetaDataTest extends \Test\TestCase {
 	/** @var bool */
 	private $isAdmin = true;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->groupManager = $this->getMockBuilder('\OC\Group\Manager')
 			->disableOriginalConstructor()
diff --git a/tests/lib/Hooks/BasicEmitterTest.php b/tests/lib/Hooks/BasicEmitterTest.php
index 948659faaba..1f88dee1032 100644
--- a/tests/lib/Hooks/BasicEmitterTest.php
+++ b/tests/lib/Hooks/BasicEmitterTest.php
@@ -50,28 +50,28 @@ class BasicEmitterTest extends \Test\TestCase {
 		throw new EmittedException;
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testAnonymousFunction() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$this->emitter->listen('Test', 'test', function () {
 			throw new EmittedException;
 		});
 		$this->emitter->emitEvent('Test', 'test');
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testStaticCallback() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$this->emitter->listen('Test', 'test', array('\Test\Hooks\BasicEmitterTest', 'staticCallBack'));
 		$this->emitter->emitEvent('Test', 'test');
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testNonStaticCallback() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$this->emitter->listen('Test', 'test', array($this, 'nonStaticCallBack'));
 		$this->emitter->emitEvent('Test', 'test');
 	}
@@ -125,10 +125,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testArguments() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$this->emitter->listen('Test', 'test', function ($foo, $bar) {
 			if ($foo == 'foo' and $bar == 'bar') {
 				throw new EmittedException;
@@ -137,10 +137,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->emitter->emitEvent('Test', 'test', array('foo', 'bar'));
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testNamedArguments() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$this->emitter->listen('Test', 'test', function ($foo, $bar) {
 			if ($foo == 'foo' and $bar == 'bar') {
 				throw new EmittedException;
@@ -216,10 +216,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testRemoveKeepOtherCallback() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$listener1 = function () {
 			throw new EmittedException;
 		};
@@ -234,10 +234,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testRemoveKeepOtherMethod() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$listener = function () {
 			throw new EmittedException;
 		};
@@ -249,10 +249,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testRemoveKeepOtherScope() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$listener = function () {
 			throw new EmittedException;
 		};
@@ -264,10 +264,10 @@ class BasicEmitterTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \Test\Hooks\EmittedException
-	 */
+	
 	public function testRemoveNonExistingName() {
+		$this->expectException(\Test\Hooks\EmittedException::class);
+
 		$listener = function () {
 			throw new EmittedException;
 		};
diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
index 0f91769d25e..2a7bd6a185d 100644
--- a/tests/lib/Http/Client/ClientTest.php
+++ b/tests/lib/Http/Client/ClientTest.php
@@ -29,7 +29,7 @@ class ClientTest extends \Test\TestCase {
 	/** @var array */
 	private $defaultRequestOptions;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->guzzleClient = $this->getMockBuilder(\GuzzleHttp\Client::class)
diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php
index 9707e955bcb..963a3eb8179 100644
--- a/tests/lib/Http/Client/ResponseTest.php
+++ b/tests/lib/Http/Client/ResponseTest.php
@@ -19,7 +19,7 @@ class ResponseTest extends \Test\TestCase {
 	/** @var GuzzleResponse */
 	private $guzzleResponse;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->guzzleResponse = new GuzzleResponse(1337);
 	}
diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
index 509dfdb66ab..fd21a1ae082 100644
--- a/tests/lib/InstallerTest.php
+++ b/tests/lib/InstallerTest.php
@@ -159,11 +159,11 @@ class InstallerTest extends TestCase {
 		$this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'), 'Cached result should be returned and fetcher should be only called once');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Certificate "4112" has been revoked
-	 */
+	
 	public function testDownloadAppWithRevokedCertificate() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Certificate "4112" has been revoked');
+
 		$appArray = [
 			[
 				'id' => 'news',
@@ -203,11 +203,11 @@ gLgK8d8sKL60JMmKHN3boHrsThKBVA==
 		$installer->downloadApp('news');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App with id news has a certificate not issued by a trusted Code Signing Authority
-	 */
+	
 	public function testDownloadAppWithNotNextcloudCertificate() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App with id news has a certificate not issued by a trusted Code Signing Authority');
+
 		$appArray = [
 			[
 				'id' => 'news',
@@ -246,11 +246,11 @@ YSu356M=
 		$installer->downloadApp('news');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App with id news has a cert issued to passman
-	 */
+	
 	public function testDownloadAppWithDifferentCN() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App with id news has a cert issued to passman');
+
 		$appArray = [
 			[
 				'id' => 'news',
@@ -289,11 +289,11 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
 		$installer->downloadApp('news');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App with id passman has invalid signature
-	 */
+	
 	public function testDownloadAppWithInvalidSignature() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App with id passman has invalid signature');
+
 		$appArray = [
 			[
 				'id' => 'passman',
@@ -357,11 +357,11 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
 		$installer->downloadApp('passman');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Extracted app testapp has more than 1 folder
-	 */
+	
 	public function testDownloadAppWithMoreThanOneFolderDownloaded() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Extracted app testapp has more than 1 folder');
+
 		$appArray = [
 			[
 				'id' => 'testapp',
@@ -441,11 +441,11 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
 		$installer->downloadApp('testapp');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App for id testapp has a wrong app ID in info.xml: testapp1
-	 */
+	
 	public function testDownloadAppWithMismatchingIdentifier() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App for id testapp has a wrong app ID in info.xml: testapp1');
+
 		$appArray = [
 			[
 				'id' => 'testapp',
@@ -606,11 +606,11 @@ MPLX6f5V9tCJtlH6ztmEcDROfvuVc0U3rEhqx2hphoyo+MZrPFpdcJL8KkIdMKbY
 		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App for id testapp has version 0.9 and tried to update to lower version 0.8
-	 */
+	
 	public function testDownloadAppWithDowngrade() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App for id testapp has version 0.9 and tried to update to lower version 0.8');
+
 		$appArray = [
 			[
 				'id' => 'testapp',
diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php
index e7553aeac1f..586a42ff547 100644
--- a/tests/lib/IntegrityCheck/CheckerTest.php
+++ b/tests/lib/IntegrityCheck/CheckerTest.php
@@ -51,7 +51,7 @@ class CheckerTest extends TestCase {
 	/** @var \OC\Files\Type\Detection|\PHPUnit_Framework_MockObject_MockObject */
 	private $mimeTypeDetector;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->environmentHelper = $this->createMock(EnvironmentHelper::class);
 		$this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
@@ -82,11 +82,11 @@ class CheckerTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Exception message
-	 */
+	
 	public function testWriteAppSignatureOfNotExistingApp() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Exception message');
+
 		$this->fileAccessHelper
 			->expects($this->at(0))
 			->method('assertDirectoryExists')
@@ -107,11 +107,11 @@ class CheckerTest extends TestCase {
 		$this->checker->writeAppSignature('NotExistingApp', $x509, $rsa);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessageRegExp /[a-zA-Z\/_-]+ is not writable/
-	 */
+	
 	public function testWriteAppSignatureWrongPermissions() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/');
+
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('file_put_contents')
@@ -480,11 +480,11 @@ class CheckerTest extends TestCase {
 		$this->assertSame([], $this->checker->verifyAppSignature('SomeApp'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Exception message
-	 */
+	
 	public function testWriteCoreSignatureWithException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Exception message');
+
 		$this->fileAccessHelper
 			->expects($this->at(0))
 			->method('assertDirectoryExists')
@@ -504,11 +504,11 @@ class CheckerTest extends TestCase {
 		$this->checker->writeCoreSignature($x509, $rsa, __DIR__);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessageRegExp /[a-zA-Z\/_-]+ is not writable/
-	 */
+	
 	public function testWriteCoreSignatureWrongPermissions() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/');
+
 		$this->fileAccessHelper
 			->expects($this->at(0))
 			->method('assertDirectoryExists')
diff --git a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php
index 333b29f826c..cf5899b663b 100644
--- a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php
+++ b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php
@@ -28,7 +28,7 @@ class AppLocatorTest extends TestCase {
 	/** @var AppLocator */
 	private $locator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->locator = new AppLocator();
 	}
@@ -37,11 +37,11 @@ class AppLocatorTest extends TestCase {
 		$this->assertSame(\OC_App::getAppPath('files'), $this->locator->getAppPath('files'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage App not found
-	 */
+	
 	public function testGetAppPathNotExistentApp() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('App not found');
+
 		$this->locator->getAppPath('aTotallyNotExistingApp');
 	}
 
diff --git a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php
index 079baaafe9f..767cdf3aaab 100644
--- a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php
+++ b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php
@@ -28,7 +28,7 @@ class EnvironmentHelperTest extends TestCase {
 	/** @var EnvironmentHelper */
 	private $environmentHelper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->environmentHelper = new EnvironmentHelper();
 		parent::setUp();
 	}
diff --git a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php
index 87c064a8458..c4d724a3654 100644
--- a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php
+++ b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php
@@ -28,7 +28,7 @@ class FileAccessHelperTest extends TestCase {
 	/** @var FileAccessHelper */
 	private $fileAccessHelper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->fileAccessHelper = new FileAccessHelper();
 	}
@@ -42,11 +42,11 @@ class FileAccessHelperTest extends TestCase {
 		$this->assertSame($data, $this->fileAccessHelper->file_get_contents($filePath));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Failed to write into /anabsolutelynotexistingfolder/on/the/system.txt
-	 */
+	
 	public function testFile_put_contentsWithException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Failed to write into /anabsolutelynotexistingfolder/on/the/system.txt');
+
 		$this->fileAccessHelper->file_put_contents('/anabsolutelynotexistingfolder/on/the/system.txt', 'MyFiles');
 	}
 
@@ -55,11 +55,11 @@ class FileAccessHelperTest extends TestCase {
 		$this->assertTrue($this->fileAccessHelper->is_writable(\OC::$server->getTempManager()->getTemporaryFile('MyFile')));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Directory /anabsolutelynotexistingfolder/on/the/system does not exist.
-	 */
+	
 	public function testAssertDirectoryExistsWithException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Directory /anabsolutelynotexistingfolder/on/the/system does not exist.');
+
 		$this->fileAccessHelper->assertDirectoryExists('/anabsolutelynotexistingfolder/on/the/system');
 	}
 
diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php
index 081d2b5cb01..370b50a56e2 100644
--- a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php
+++ b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php
@@ -28,7 +28,7 @@ class ExcludeFileByNameFilterIteratorTest extends TestCase {
 	/** @var ExcludeFileByNameFilterIterator|\PHPUnit\Framework\MockObject\MockObject */
 	protected $filter;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->filter = $this->getMockBuilder(ExcludeFileByNameFilterIterator::class)
 			->disableOriginalConstructor()
diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php
index 9235542b199..c75bfba5b99 100644
--- a/tests/lib/L10N/FactoryTest.php
+++ b/tests/lib/L10N/FactoryTest.php
@@ -36,7 +36,7 @@ class FactoryTest extends TestCase {
 	/** @var string */
 	protected $serverRoot;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)
diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/lib/L10N/LanguageIteratorTest.php
index f0ba1bc0aeb..9223db716f4 100644
--- a/tests/lib/L10N/LanguageIteratorTest.php
+++ b/tests/lib/L10N/LanguageIteratorTest.php
@@ -36,7 +36,7 @@ class LanguageIteratorTest extends TestCase {
 	/** @var LanguageIterator */
 	protected $iterator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->user = $this->createMock(IUser::class);
diff --git a/tests/lib/LargeFileHelperTest.php b/tests/lib/LargeFileHelperTest.php
index bfe26246918..3cc9d13d74c 100644
--- a/tests/lib/LargeFileHelperTest.php
+++ b/tests/lib/LargeFileHelperTest.php
@@ -37,10 +37,10 @@ class LargeFileHelperTest extends TestCase {
 		);
 	}
 
-	/**
-	* @expectedException \UnexpectedValueException
-	*/
+	
 	public function testFormatUnsignedIntegerStringException() {
+		$this->expectException(\UnexpectedValueException::class);
+
 		$this->helper->formatUnsignedInteger('900ABCD254740993');
 	}
 }
diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php
index b86c4893676..21d5dbc8bab 100644
--- a/tests/lib/LegacyHelperTest.php
+++ b/tests/lib/LegacyHelperTest.php
@@ -15,11 +15,11 @@ class LegacyHelperTest extends \Test\TestCase {
 	/** @var string */
 	private $originalWebRoot;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->originalWebRoot = \OC::$WEBROOT;
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		// Reset webRoot
 		\OC::$WEBROOT = $this->originalWebRoot;
 	}
diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/lib/Lock/DBLockingProviderTest.php
index b7929aee476..73a7b6c3f83 100644
--- a/tests/lib/Lock/DBLockingProviderTest.php
+++ b/tests/lib/Lock/DBLockingProviderTest.php
@@ -49,7 +49,7 @@ class DBLockingProviderTest extends LockingProvider {
 
 	protected $currentTime;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->currentTime = time();
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->timeFactory->expects($this->any())
@@ -68,7 +68,7 @@ class DBLockingProviderTest extends LockingProvider {
 		return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory, 3600);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`');
 		parent::tearDown();
 	}
diff --git a/tests/lib/Lock/LockingProvider.php b/tests/lib/Lock/LockingProvider.php
index 75117657bf2..93eba367af2 100644
--- a/tests/lib/Lock/LockingProvider.php
+++ b/tests/lib/Lock/LockingProvider.php
@@ -73,10 +73,10 @@ abstract class LockingProvider extends TestCase {
 		$this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testDoubleExclusiveLock() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 		$this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
@@ -90,10 +90,10 @@ abstract class LockingProvider extends TestCase {
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testExclusiveLockAfterShared() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
 		$this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
@@ -164,10 +164,10 @@ abstract class LockingProvider extends TestCase {
 	}
 
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testSharedLockAfterExclusive() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 		$this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
@@ -211,41 +211,41 @@ abstract class LockingProvider extends TestCase {
 		$this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testChangeLockToExclusiveDoubleShared() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
 		$this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testChangeLockToExclusiveNoShared() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testChangeLockToExclusiveFromExclusive() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 		$this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testChangeLockToSharedNoExclusive() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->changeLock('foo', ILockingProvider::LOCK_SHARED);
 	}
 
-	/**
-	 * @expectedException \OCP\Lock\LockedException
-	 */
+	
 	public function testChangeLockToSharedFromShared() {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
 		$this->instance->changeLock('foo', ILockingProvider::LOCK_SHARED);
 	}
diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/lib/Lock/MemcacheLockingProviderTest.php
index 6d37aaa5367..7b7c649c886 100644
--- a/tests/lib/Lock/MemcacheLockingProviderTest.php
+++ b/tests/lib/Lock/MemcacheLockingProviderTest.php
@@ -38,7 +38,7 @@ class MemcacheLockingProviderTest extends LockingProvider {
 		return new \OC\Lock\MemcacheLockingProvider($this->memcache);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->memcache->clear();
 		parent::tearDown();
 	}
diff --git a/tests/lib/Lockdown/Filesystem/NoFSTest.php b/tests/lib/Lockdown/Filesystem/NoFSTest.php
index eaaa7b12955..28bdb08c4a4 100644
--- a/tests/lib/Lockdown/Filesystem/NoFSTest.php
+++ b/tests/lib/Lockdown/Filesystem/NoFSTest.php
@@ -34,7 +34,7 @@ use Test\Traits\UserTrait;
 class NoFSTest extends \Test\TestCase {
 	use UserTrait;
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$token = new DefaultToken();
 		$token->setScope([
 			'filesystem' => true
@@ -43,7 +43,7 @@ class NoFSTest extends \Test\TestCase {
 		parent::tearDown();
 	}
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$token = new DefaultToken();
 		$token->setScope([
diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/lib/Lockdown/Filesystem/NullCacheTest.php
index f9c6fb3ff6c..67d44c430f5 100644
--- a/tests/lib/Lockdown/Filesystem/NullCacheTest.php
+++ b/tests/lib/Lockdown/Filesystem/NullCacheTest.php
@@ -34,7 +34,7 @@ class NulLCacheTest extends \Test\TestCase {
 	/** @var NullCache */
 	private $cache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->cache = new NullCache();
diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php
index 97a5b775d06..5bdf3b44ba0 100644
--- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php
+++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php
@@ -36,7 +36,7 @@ class NullStorageTest extends TestCase  {
 	/** @var NullStorage */
 	private $storage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->storage = new NullStorage([]);
diff --git a/tests/lib/Lockdown/LockdownManagerTest.php b/tests/lib/Lockdown/LockdownManagerTest.php
index 2f1c794d4d7..7b52994d381 100644
--- a/tests/lib/Lockdown/LockdownManagerTest.php
+++ b/tests/lib/Lockdown/LockdownManagerTest.php
@@ -29,7 +29,7 @@ use Test\TestCase;
 class LockdownManagerTest extends TestCase {
 	private $sessionCallback;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->sessionCallback = function() {
diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php
index 60d7d2bbbf8..d48826ff5c5 100644
--- a/tests/lib/Mail/EMailTemplateTest.php
+++ b/tests/lib/Mail/EMailTemplateTest.php
@@ -39,7 +39,7 @@ class EMailTemplateTest extends TestCase {
 	/** @var EMailTemplate */
 	private $emailTemplate;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->defaults = $this->createMock(Defaults::class);
diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
index 911e5708296..3a08cd9acf2 100644
--- a/tests/lib/Mail/MailerTest.php
+++ b/tests/lib/Mail/MailerTest.php
@@ -31,7 +31,7 @@ class MailerTest extends TestCase {
 	/** @var Mailer */
 	private $mailer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
@@ -126,10 +126,10 @@ class MailerTest extends TestCase {
 		$this->assertInstanceOf('\OC\Mail\Message', $this->mailer->createMessage());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testSendInvalidMailException() {
+		$this->expectException(\Exception::class);
+
 		$message = $this->getMockBuilder('\OC\Mail\Message')
 			->disableOriginalConstructor()->getMock();
 		$message->expects($this->once())
diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php
index 729178d328d..e0a0f468a50 100644
--- a/tests/lib/Mail/MessageTest.php
+++ b/tests/lib/Mail/MessageTest.php
@@ -31,7 +31,7 @@ class MessageTest extends TestCase {
 		);
 	}
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->swiftMessage = $this->getMockBuilder('\Swift_Message')
diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php
index 971b22d69b2..cf4da7839c4 100644
--- a/tests/lib/Memcache/FactoryTest.php
+++ b/tests/lib/Memcache/FactoryTest.php
@@ -127,9 +127,10 @@ class FactoryTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider cacheUnavailableProvider
-	 * @expectedException \OC\HintException
 	 */
 	public function testCacheNotAvailableException($localCache, $distributedCache) {
+		$this->expectException(\OC\HintException::class);
+
 		$logger = $this->getMockBuilder(ILogger::class)->getMock();
 		new \OC\Memcache\Factory('abc', $logger, $localCache, $distributedCache);
 	}
diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php
index 3b94c22fd50..8c467d58269 100644
--- a/tests/lib/Migration/BackgroundRepairTest.php
+++ b/tests/lib/Migration/BackgroundRepairTest.php
@@ -68,7 +68,7 @@ class BackgroundRepairTest extends TestCase {
 	/** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject $dispatcher  */
 	private $dispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = $this->getMockBuilder('OC\BackgroundJob\JobList')
diff --git a/tests/lib/Notification/ActionTest.php b/tests/lib/Notification/ActionTest.php
index 5103babd0e2..1923f2305e1 100644
--- a/tests/lib/Notification/ActionTest.php
+++ b/tests/lib/Notification/ActionTest.php
@@ -30,7 +30,7 @@ class ActionTest extends TestCase {
 	/** @var IAction */
 	protected $action;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->action = new Action();
 	}
@@ -64,9 +64,10 @@ class ActionTest extends TestCase {
 	 * @dataProvider dataSetLabelInvalid
 	 * @param mixed $label
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetLabelInvalid($label) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->action->setLabel($label);
 	}
 
@@ -98,9 +99,10 @@ class ActionTest extends TestCase {
 	 * @dataProvider dataSetParsedLabelInvalid
 	 * @param mixed $label
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetParsedLabelInvalid($label) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->action->setParsedLabel($label);
 	}
 
@@ -141,9 +143,10 @@ class ActionTest extends TestCase {
 	 * @param mixed $link
 	 * @param mixed $type
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetLinkInvalid($link, $type) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->action->setLink($link, $type);
 	}
 
diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php
index 5de0b572607..6ca83b4b367 100644
--- a/tests/lib/Notification/ManagerTest.php
+++ b/tests/lib/Notification/ManagerTest.php
@@ -40,7 +40,7 @@ class ManagerTest extends TestCase {
 	/** @var ILogger|MockObject */
 	protected $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->validator = $this->createMock(IValidator::class);
 		$this->logger = $this->createMock(ILogger::class);
@@ -119,10 +119,10 @@ class ManagerTest extends TestCase {
 		$manager->notify($notification);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testNotifyInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->getMockBuilder(INotification::class)
 			->disableOriginalConstructor()
diff --git a/tests/lib/Notification/NotificationTest.php b/tests/lib/Notification/NotificationTest.php
index 6b021ceb6d3..c70fa1ec7df 100644
--- a/tests/lib/Notification/NotificationTest.php
+++ b/tests/lib/Notification/NotificationTest.php
@@ -35,7 +35,7 @@ class NotificationTest extends TestCase {
 	/** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */
 	protected $validator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->validator = $this->createMock(IValidator::class);
 		$this->notification = new Notification($this->validator);
@@ -85,9 +85,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetAppInvalid
 	 * @param mixed $app
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetAppInvalid($app) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setApp($app);
 	}
 
@@ -114,9 +115,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetUserInvalid
 	 * @param mixed $user
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetUserInvalid($user) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setUser($user);
 	}
 
@@ -156,10 +158,11 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetDateTimeZero
 	 * @param \DateTime $dateTime
 	 *
-	 * @expectedException \InvalidArgumentException
 	 * @expectedMessage 'The given date time is invalid'
 	 */
 	public function testSetDateTimeZero($dateTime) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setDateTime($dateTime);
 	}
 
@@ -198,10 +201,11 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetObjectIdInvalid
 	 * @param mixed $id
 	 *
-	 * @expectedException \InvalidArgumentException
 	 * @expectedMessage 'The given object id is invalid'
 	 */
 	public function testSetObjectIdInvalid($id) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setObject('object', $id);
 	}
 
@@ -234,9 +238,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetSubjectInvalidSubject
 	 * @param mixed $subject
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetSubjectInvalidSubject($subject) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setSubject($subject, []);
 	}
 
@@ -262,9 +267,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetParsedSubjectInvalid
 	 * @param mixed $subject
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetParsedSubjectInvalid($subject) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setParsedSubject($subject);
 	}
 
@@ -297,9 +303,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetMessageInvalidMessage
 	 * @param mixed $message
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetMessageInvalidMessage($message) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setMessage($message, []);
 	}
 
@@ -325,9 +332,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetParsedMessageInvalid
 	 * @param mixed $message
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetParsedMessageInvalid($message) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setParsedMessage($message);
 	}
 
@@ -353,9 +361,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetLinkInvalid
 	 * @param mixed $link
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetLinkInvalid($link) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setLink($link);
 	}
 
@@ -381,9 +390,10 @@ class NotificationTest extends TestCase {
 	 * @dataProvider dataSetIconInvalid
 	 * @param mixed $icon
 	 *
-	 * @expectedException \InvalidArgumentException
 	 */
 	public function testSetIconInvalid($icon) {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->notification->setIcon($icon);
 	}
 
@@ -407,10 +417,10 @@ class NotificationTest extends TestCase {
 		$this->assertEquals([], $this->notification->getParsedActions());
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testAddActionInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
 		$action = $this->createMock(IAction::class);
 		$action->expects($this->once())
@@ -453,10 +463,10 @@ class NotificationTest extends TestCase {
 		$this->assertEquals([], $this->notification->getActions());
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testAddParsedActionInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
 		$action = $this->createMock(IAction::class);
 		$action->expects($this->once())
diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php
index cbdde7bc313..710d683841f 100644
--- a/tests/lib/OCS/DiscoveryServiceTest.php
+++ b/tests/lib/OCS/DiscoveryServiceTest.php
@@ -39,7 +39,7 @@ class DiscoveryServiceTest extends TestCase {
 	/** @var  IDiscoveryService */
 	private $discoveryService;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock();
diff --git a/tests/lib/OCS/ProviderTest.php b/tests/lib/OCS/ProviderTest.php
index 4f962f7f791..7ee802e54fb 100644
--- a/tests/lib/OCS/ProviderTest.php
+++ b/tests/lib/OCS/ProviderTest.php
@@ -31,7 +31,7 @@ class ProviderTest extends \Test\TestCase {
 	/** @var Provider */
 	private $ocsProvider;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock();
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
index 65e30df4a15..09c4a16f87a 100644
--- a/tests/lib/Preview/BackgroundCleanupJobTest.php
+++ b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -61,7 +61,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase {
 	/** @var IRootFolder */
 	private $rootFolder;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userId = $this->getUniqueID();
@@ -87,7 +87,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase {
 		$this->rootFolder = \OC::$server->getRootFolder();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		if ($this->trashEnabled) {
 			$appManager = \OC::$server->getAppManager();
 			$appManager->enableApp('files_trashbin');
diff --git a/tests/lib/Preview/BitmapTest.php b/tests/lib/Preview/BitmapTest.php
index 63f9c6a013e..952f72b276a 100644
--- a/tests/lib/Preview/BitmapTest.php
+++ b/tests/lib/Preview/BitmapTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class BitmapTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$fileName = 'testimage.eps';
diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php
index 167f6aba1b7..cfb78a05da5 100644
--- a/tests/lib/Preview/GeneratorTest.php
+++ b/tests/lib/Preview/GeneratorTest.php
@@ -58,7 +58,7 @@ class GeneratorTest extends \Test\TestCase {
 	/** @var Generator */
 	private $generator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php
index 2b4c63098b5..f75ae3192a1 100644
--- a/tests/lib/Preview/HEICTest.php
+++ b/tests/lib/Preview/HEICTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class HEICTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) {
 			$this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests');
 		} else {
diff --git a/tests/lib/Preview/ImageTest.php b/tests/lib/Preview/ImageTest.php
index 200deef3866..40267538804 100644
--- a/tests/lib/Preview/ImageTest.php
+++ b/tests/lib/Preview/ImageTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class ImageTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$fileName = 'testimage.jpg';
diff --git a/tests/lib/Preview/MP3Test.php b/tests/lib/Preview/MP3Test.php
index 5e0764a8ed7..15915ac2578 100644
--- a/tests/lib/Preview/MP3Test.php
+++ b/tests/lib/Preview/MP3Test.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class MP3Test extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$fileName = 'testimage.mp3';
diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php
index 7437ff3567a..2415102a83d 100644
--- a/tests/lib/Preview/MovieTest.php
+++ b/tests/lib/Preview/MovieTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class MovieTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$avconvBinary = \OC_Helper::findBinaryPath('avconv');
 		$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
 
diff --git a/tests/lib/Preview/OfficeTest.php b/tests/lib/Preview/OfficeTest.php
index 62981f2f003..555b3f77747 100644
--- a/tests/lib/Preview/OfficeTest.php
+++ b/tests/lib/Preview/OfficeTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class OfficeTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$libreofficeBinary = \OC_Helper::findBinaryPath('libreoffice');
 		$openofficeBinary = ($libreofficeBinary) ? null : \OC_Helper::findBinaryPath('openoffice');
 
diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php
index ccfeede75e6..73ccbc0b136 100644
--- a/tests/lib/Preview/SVGTest.php
+++ b/tests/lib/Preview/SVGTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class SVGTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$checkImagick = new \Imagick();
 		if (count($checkImagick->queryFormats('SVG')) === 1) {
 			parent::setUp();
diff --git a/tests/lib/Preview/TXTTest.php b/tests/lib/Preview/TXTTest.php
index f2cdb72cdd1..e4c6e76c47f 100644
--- a/tests/lib/Preview/TXTTest.php
+++ b/tests/lib/Preview/TXTTest.php
@@ -30,7 +30,7 @@ namespace Test\Preview;
  */
 class TXTTest extends Provider {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$fileName = 'lorem-big.txt';
diff --git a/tests/lib/Remote/Api/OCSTest.php b/tests/lib/Remote/Api/OCSTest.php
index af0b570c091..43e7c61a4cd 100644
--- a/tests/lib/Remote/Api/OCSTest.php
+++ b/tests/lib/Remote/Api/OCSTest.php
@@ -67,11 +67,11 @@ class OCSTest extends TestCase {
 		$this->assertEquals('user', $user->getUserId());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Invalid user response, expected field email not found
-	 */
+	
 	public function testGetUserInvalidResponse() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Invalid user response, expected field email not found');
+
 		$client = $this->getOCSClient();
 
 		$this->expectGetRequest($this->getOCSUrl('cloud/users/user'),
@@ -81,10 +81,10 @@ class OCSTest extends TestCase {
 		$client->getUser('user');
 	}
 
-	/**
-	 * @expectedException \OC\ForbiddenException
-	 */
+	
 	public function testInvalidPassword() {
+		$this->expectException(\OC\ForbiddenException::class);
+
 		$client = $this->getOCSClient();
 
 		$this->expectGetRequest($this->getOCSUrl('cloud/users/user'),
diff --git a/tests/lib/Remote/InstanceTest.php b/tests/lib/Remote/InstanceTest.php
index 7253228f231..0adb608d875 100644
--- a/tests/lib/Remote/InstanceTest.php
+++ b/tests/lib/Remote/InstanceTest.php
@@ -73,11 +73,11 @@ class InstanceTest extends TestCase {
 		$this->assertEquals(false, $instance2->isActive());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage refusing to connect to remote instance(example.com) over http that was previously accessible over https
-	 */
+	
 	public function testPreventDowngradeAttach() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('refusing to connect to remote instance(example.com) over http that was previously accessible over https');
+
 		$instance = new Instance('example.com', $this->cache, $this->getClientService());
 		$this->expectGetRequest('https://example.com/status.php', '{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"13.0.0.5","versionstring":"13.0.0 alpha","edition":"","productname":"Nextcloud"}');
 
diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php
index 891f7d600e5..1d5af18a8a3 100644
--- a/tests/lib/Repair/NC11/FixMountStoragesTest.php
+++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php
@@ -43,7 +43,7 @@ class FixMountStoragesTest extends TestCase {
 	/** @var FixMountStorages */
 	private $repair;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->db = \OC::$server->getDatabaseConnection();
diff --git a/tests/lib/RepairStepTest.php b/tests/lib/RepairStepTest.php
index 53b743cf13c..433a161e8fa 100644
--- a/tests/lib/RepairStepTest.php
+++ b/tests/lib/RepairStepTest.php
@@ -39,7 +39,7 @@ class RepairTest extends TestCase {
 	/** @var string[] */
 	private $outputArray;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$dispatcher = new EventDispatcher();
 		$this->repair = new \OC\Repair([], $dispatcher);
diff --git a/tests/lib/RichObjectStrings/DefinitionsTest.php b/tests/lib/RichObjectStrings/DefinitionsTest.php
index e0d400bff2c..829689704e7 100644
--- a/tests/lib/RichObjectStrings/DefinitionsTest.php
+++ b/tests/lib/RichObjectStrings/DefinitionsTest.php
@@ -36,11 +36,11 @@ class DefinitionsTest extends TestCase {
 		return $testsuite;
 	}
 
-	/**
-	 * @expectedException \OCP\RichObjectStrings\InvalidObjectExeption
-	 * @expectedExceptionMessage Object type is undefined
-	 */
+	
 	public function testGetDefinitionNotExisting() {
+		$this->expectException(\OCP\RichObjectStrings\InvalidObjectExeption::class);
+		$this->expectExceptionMessage('Object type is undefined');
+
 		$definitions = new Definitions();
 		$definitions->getDefinition('NotExistingType');
 	}
diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/lib/Security/Bruteforce/CapabilitiesTest.php
index 001d9983617..60873236e44 100644
--- a/tests/lib/Security/Bruteforce/CapabilitiesTest.php
+++ b/tests/lib/Security/Bruteforce/CapabilitiesTest.php
@@ -36,7 +36,7 @@ class CapabilitiesTest extends TestCase {
 	/** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */
 	private $throttler;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/lib/Security/Bruteforce/ThrottlerTest.php b/tests/lib/Security/Bruteforce/ThrottlerTest.php
index 7fbcd763ce6..048540fb5a5 100644
--- a/tests/lib/Security/Bruteforce/ThrottlerTest.php
+++ b/tests/lib/Security/Bruteforce/ThrottlerTest.php
@@ -44,7 +44,7 @@ class ThrottlerTest extends TestCase {
 	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->dbConnection = $this->createMock(IDBConnection::class);
 		$this->logger = $this->createMock(ILogger::class);
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
index e96111a06df..009613fbe32 100644
--- a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
+++ b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
@@ -37,7 +37,7 @@ class ContentSecurityPolicyManagerTest extends TestCase {
 	/** @var ContentSecurityPolicyManager */
 	private $contentSecurityPolicyManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->dispatcher = \OC::$server->query(IEventDispatcher::class);
 		$this->contentSecurityPolicyManager = new ContentSecurityPolicyManager($this->dispatcher);
diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php
index cb2a8f0d931..346ace943d9 100644
--- a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php
+++ b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php
@@ -35,7 +35,7 @@ class ContentSecurityPolicyNonceManagerTest extends TestCase  {
 	/** @var ContentSecurityPolicyNonceManager */
 	private $nonceManager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->csrfTokenManager = $this->createMock(CsrfTokenManager::class);
 		$this->request = $this->createMock(Request::class);
 		$this->nonceManager = new ContentSecurityPolicyNonceManager(
diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
index 314902fb725..5ab15c73bf2 100644
--- a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
+++ b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php
@@ -27,7 +27,7 @@ class CsrfTokenGeneratorTest extends \Test\TestCase {
 	/** @var \OC\Security\CSRF\CsrfTokenGenerator */
 	private $csrfTokenGenerator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->random = $this->getMockBuilder('\OCP\Security\ISecureRandom')
 			->disableOriginalConstructor()->getMock();
diff --git a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php
index 0f9755c2251..29fbbfe3b26 100644
--- a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php
+++ b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php
@@ -29,7 +29,7 @@ class CsrfTokenManagerTest extends \Test\TestCase {
 	/** @var \OC\Security\CSRF\TokenStorage\SessionStorage */
 	private $storageInterface;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->tokenGenerator = $this->getMockBuilder('\OC\Security\CSRF\CsrfTokenGenerator')
 			->disableOriginalConstructor()->getMock();
diff --git a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
index 19b13f76d86..8d4a966efea 100644
--- a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
+++ b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php
@@ -29,7 +29,7 @@ class SessionStorageTest extends \Test\TestCase {
 	/** @var \OC\Security\CSRF\TokenStorage\SessionStorage */
 	private $sessionStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->session = $this->getMockBuilder(ISession::class)
 			->disableOriginalConstructor()->getMock();
@@ -54,10 +54,11 @@ class SessionStorageTest extends \Test\TestCase {
 	 * @param string $token
 	 * @dataProvider getTokenDataProvider
 	 *
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Session does not contain a requesttoken
 	 */
 	public function testGetTokenWithEmptyToken($token) {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Session does not contain a requesttoken');
+
 		$this->session
 			->expects($this->once())
 			->method('get')
diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php
index e7d15e65c52..136c3160413 100644
--- a/tests/lib/Security/CertificateManagerTest.php
+++ b/tests/lib/Security/CertificateManagerTest.php
@@ -93,11 +93,11 @@ class CertificateManagerTest extends \Test\TestCase {
 		$this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Certificate could not get parsed.
-	 */
+	
 	function testAddInvalidCertificate() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Certificate could not get parsed.');
+
 		$this->certificateManager->addCertificate('InvalidCertificate', 'invalidCertificate');
 	}
 
@@ -113,12 +113,13 @@ class CertificateManagerTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Filename is not valid
 	 * @dataProvider dangerousFileProvider
 	 * @param string $filename
 	 */
 	function testAddDangerousFile($filename) {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Filename is not valid');
+
 		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename);
 	}
 
diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php
index c9d6ea90bd6..986554cf967 100644
--- a/tests/lib/Security/CertificateTest.php
+++ b/tests/lib/Security/CertificateTest.php
@@ -43,20 +43,20 @@ class CertificateTest extends \Test\TestCase {
 		$this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Certificate could not get parsed.
-	 */
+	
 	public function testBogusData() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Certificate could not get parsed.');
+
 		$certificate = new Certificate('foo', 'bar');
 		$certificate->getIssueDate();
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Certificate could not get parsed.
-	 */
+	
 	function testCertificateStartingWithFileReference() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Certificate could not get parsed.');
+
 		new Certificate('file://'.__DIR__ . '/../../data/certificates/goodCertificate.crt', 'bar');
 	}
 
diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php
index b0032a555fd..a2c8055750b 100644
--- a/tests/lib/Security/CryptoTest.php
+++ b/tests/lib/Security/CryptoTest.php
@@ -37,11 +37,11 @@ class CryptoTest extends \Test\TestCase {
 		$this->assertEquals($stringToEncrypt, $this->crypto->decrypt($ciphertext));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage HMAC does not match.
-	 */
+	
 	function testWrongPassword() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('HMAC does not match.');
+
 		$stringToEncrypt = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt.';
 		$ciphertext = $this->crypto->encrypt($stringToEncrypt);
 		$this->crypto->decrypt($ciphertext, 'A wrong password!');
@@ -53,20 +53,20 @@ class CryptoTest extends \Test\TestCase {
 		$this->assertEquals($stringToEncrypt, $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd'));
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage HMAC does not match.
-	 */
+	
 	function testWrongIV() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('HMAC does not match.');
+
 		$encryptedString = '560f5436ba864b9f12f7f7ca6d41c327554a6f2c0a160a03316b202af07c65163274993f3a46e7547c07ba89304f00594a2f3bd99f83859097c58049c39d0d4ade10e0de914ff0604961e7c849d0271ed6c0b23f984ba16e7d033e3305fb0910e7b6a2a65c988d17dbee71d8f953684d|d2kdFUspVjC0o0sr|1a5feacf87eaa6869a6abdfba9a296e7bbad45b6ad89f7dce67cdc98e2da5dc4379cc672cc655e52bbf19599bf59482fbea13a73937697fa656bf10f3fc4f1aa';
 		$this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd');
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Authenticated ciphertext could not be decoded.
-	 */
+	
 	function testWrongParameters() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Authenticated ciphertext could not be decoded.');
+
 		$encryptedString = '1|2';
 		$this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd');
 	}
diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
index ec8ffbee77b..179bd6630ba 100644
--- a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
+++ b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
@@ -42,7 +42,7 @@ class FeaturePolicyManagerTest extends TestCase {
 	/** @var FeaturePolicyManager */
 	private $manager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->dispatcher = \OC::$server->query(IEventDispatcher::class);
 		$this->manager = new FeaturePolicyManager($this->dispatcher);
diff --git a/tests/lib/Security/IdentityProof/KeyTest.php b/tests/lib/Security/IdentityProof/KeyTest.php
index 34493df9878..ae5f77f1609 100644
--- a/tests/lib/Security/IdentityProof/KeyTest.php
+++ b/tests/lib/Security/IdentityProof/KeyTest.php
@@ -30,7 +30,7 @@ class KeyTest extends TestCase {
 	/** @var Key */
 	private $key;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->key = new Key('public', 'private');
diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php
index 9e58ac5c00f..aff6d3ed5c7 100644
--- a/tests/lib/Security/IdentityProof/ManagerTest.php
+++ b/tests/lib/Security/IdentityProof/ManagerTest.php
@@ -50,7 +50,7 @@ class ManagerTest extends TestCase  {
 	/** @var ILogger|MockObject */
 	private $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
@@ -219,10 +219,10 @@ class ManagerTest extends TestCase  {
 	}
 
 
-	/**
-	 * @expectedException \RuntimeException
-	 */
+	
 	public function testGetSystemKeyFailure() {
+		$this->expectException(\RuntimeException::class);
+
 		$manager = $this->getManager(['retrieveKey']);
 
 		/** @var Key|\PHPUnit_Framework_MockObject_MockObject $key */
diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php
index 850ae08d4f0..884065e6a1a 100644
--- a/tests/lib/Security/IdentityProof/SignerTest.php
+++ b/tests/lib/Security/IdentityProof/SignerTest.php
@@ -89,7 +89,7 @@ gQIDAQAB
 	/** @var Signer */
 	private $signer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->key = new Key($this->public, $this->private);
diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php
index d117f7d8c70..e4df424c2ca 100644
--- a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php
+++ b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php
@@ -37,7 +37,7 @@ class MemoryCacheTest extends TestCase {
 	/** @var MemoryCache */
 	private $memoryCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/lib/Security/RateLimiting/LimiterTest.php
index 1e72f8e4960..20b35029050 100644
--- a/tests/lib/Security/RateLimiting/LimiterTest.php
+++ b/tests/lib/Security/RateLimiting/LimiterTest.php
@@ -38,7 +38,7 @@ class LimiterTest extends TestCase {
 	/** @var Limiter */
 	private $limiter;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
@@ -50,11 +50,11 @@ class LimiterTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \OC\Security\RateLimiting\Exception\RateLimitExceededException
-	 * @expectedExceptionMessage Rate limit exceeded
-	 */
+	
 	public function testRegisterAnonRequestExceeded() {
+		$this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class);
+		$this->expectExceptionMessage('Rate limit exceeded');
+
 		$this->backend
 			->expects($this->once())
 			->method('getAttempts')
@@ -94,11 +94,11 @@ class LimiterTest extends TestCase {
 		$this->limiter->registerAnonRequest('MyIdentifier', 100, 100, '127.0.0.1');
 	}
 
-	/**
-	 * @expectedException \OC\Security\RateLimiting\Exception\RateLimitExceededException
-	 * @expectedExceptionMessage Rate limit exceeded
-	 */
+	
 	public function testRegisterUserRequestExceeded() {
+		$this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class);
+		$this->expectExceptionMessage('Rate limit exceeded');
+
 		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
 		$user = $this->createMock(IUser::class);
 		$user
diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php
index 54eaa159d1d..fbedad61fd7 100644
--- a/tests/lib/ServerTest.php
+++ b/tests/lib/ServerTest.php
@@ -38,7 +38,7 @@ class ServerTest extends \Test\TestCase {
 	protected $server;
 
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$config = new \OC\Config(\OC::$configDir);
 		$this->server = new \OC\Server('', $config);
diff --git a/tests/lib/Session/MemoryTest.php b/tests/lib/Session/MemoryTest.php
index 7b60e0197f4..79053ccb1c8 100644
--- a/tests/lib/Session/MemoryTest.php
+++ b/tests/lib/Session/MemoryTest.php
@@ -16,10 +16,10 @@ class MemoryTest extends Session {
 		$this->instance = new \OC\Session\Memory($this->getUniqueID());
 	}
 
-	/**
-	 * @expectedException \OCP\Session\Exceptions\SessionNotAvailableException
-	 */
+	
 	public function testThrowsExceptionOnGetId() {
+		$this->expectException(\OCP\Session\Exceptions\SessionNotAvailableException::class);
+
 		$this->instance->getId();
 	}
 
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index f82a623b3d5..b6870068660 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -51,7 +51,7 @@ class ManagerTest extends TestCase {
 	/** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */
 	private $container;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->logger = $this->createMock(ILogger::class);
diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php
index 93c04ce8449..7ab3eb78539 100644
--- a/tests/lib/SetupTest.php
+++ b/tests/lib/SetupTest.php
@@ -120,11 +120,11 @@ class SetupTest extends \Test\TestCase {
 		$this->assertSame($expectedResult, $result);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Supported databases are not properly configured.
-	 */
+	
 	public function testGetSupportedDatabaseException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Supported databases are not properly configured.');
+
 		$this->config
 			->expects($this->once())
 			->method('getValue')
diff --git a/tests/lib/Share/HelperTest.php b/tests/lib/Share/HelperTest.php
index 02118bf0e2e..dc2d26509e3 100644
--- a/tests/lib/Share/HelperTest.php
+++ b/tests/lib/Share/HelperTest.php
@@ -122,9 +122,10 @@ class HelperTest extends \Test\TestCase {
 	 * @dataProvider dataTestSplitUserRemoteError
 	 *
 	 * @param string $id
-	 * @expectedException \OC\HintException
 	 */
 	public function testSplitUserRemoteError($id) {
+		$this->expectException(\OC\HintException::class);
+
 		\OC\Share\Helper::splitUserRemote($id);
 	}
 
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 0f0e77c3207..ff3cafbdf7c 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -73,7 +73,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */
 	protected $urlGenerator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->dbConn = \OC::$server->getDatabaseConnection();
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
@@ -100,7 +100,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->dbConn->getQueryBuilder()->delete('share')->execute();
 		$this->dbConn->getQueryBuilder()->delete('filecache')->execute();
 		$this->dbConn->getQueryBuilder()->delete('storages')->execute();
@@ -143,10 +143,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
 
 
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetShareByIdNotExist() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$this->provider->getShareById(1);
 	}
 
@@ -835,10 +835,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->assertSame(null, $share->getSharedWith());
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetShareByTokenNotFound() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$this->provider->getShareByToken('invalidtoken');
 	}
 
@@ -1538,11 +1538,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->assertEquals('user2', $share2['share_with']);
 	}
 
-	/**
-	 * @expectedException \OC\Share20\Exception\ProviderException
-	 * @expectedExceptionMessage  Recipient not in receiving group
-	 */
+	
 	public function testDeleteFromSelfGroupUserNotInGroup() {
+		$this->expectException(\OC\Share20\Exception\ProviderException::class);
+		$this->expectExceptionMessage('Recipient not in receiving group');
+
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
 			->values([
@@ -1583,11 +1583,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->provider->deleteFromSelf($share, 'user2');
 	}
 
-	/**
-	 * @expectedException \OC\Share20\Exception\ProviderException
-	 * @expectedExceptionMessage Group "group" does not exist
-	 */
+	
 	public function testDeleteFromSelfGroupDoesNotExist() {
+		$this->expectException(\OC\Share20\Exception\ProviderException::class);
+		$this->expectExceptionMessage('Group "group" does not exist');
+
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
 			->values([
@@ -1674,11 +1674,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->assertCount(0, $shares);
 	}
 
-	/**
-	 * @expectedException \OC\Share20\Exception\ProviderException
-	 * @expectedExceptionMessage Recipient does not match
-	 */
+	
 	public function testDeleteFromSelfUserNotRecipient() {
+		$this->expectException(\OC\Share20\Exception\ProviderException::class);
+		$this->expectExceptionMessage('Recipient does not match');
+
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
 			->values([
@@ -1717,11 +1717,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->provider->deleteFromSelf($share, $user3);
 	}
 
-	/**
-	 * @expectedException \OC\Share20\Exception\ProviderException
-	 * @expectedExceptionMessage Invalid shareType
-	 */
+	
 	public function testDeleteFromSelfLink() {
+		$this->expectException(\OC\Share20\Exception\ProviderException::class);
+		$this->expectExceptionMessage('Invalid shareType');
+
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
 			->values([
diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php
index d761d011794..14fe32323c1 100644
--- a/tests/lib/Share20/LegacyHooksTest.php
+++ b/tests/lib/Share20/LegacyHooksTest.php
@@ -42,7 +42,7 @@ class LegacyHooksTest extends TestCase {
 	/** @var Manager */
 	private $manager;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->eventDispatcher = new EventDispatcher();
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index a7e2ef7d604..c4cc335dd5e 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -101,7 +101,7 @@ class ManagerTest extends \Test\TestCase {
 	/** @var  \OC_Defaults|MockObject */
 	protected $defaults;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 
 		$this->logger = $this->createMock(ILogger::class);
 		$this->config = $this->createMock(IConfig::class);
@@ -172,10 +172,10 @@ class ManagerTest extends \Test\TestCase {
 			]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testDeleteNoShareId() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$share = $this->manager->newShare();
 
 		$this->manager->deleteShare($share);
@@ -445,10 +445,10 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertEquals($share, $this->manager->getShareById('default:42'));
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetExpiredShareById() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$manager = $this->createManagerMock()
 			->setMethods(['deleteShare'])
 			->getMock();
@@ -472,11 +472,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->getShareById('default:42');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Passwords are enforced for link shares
-	 */
+	
 	public function testVerifyPasswordNullButEnforced() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Passwords are enforced for link shares');
+
 		$this->config->method('getAppValue')->will($this->returnValueMap([
 			['core', 'shareapi_enforce_links_password', 'no', 'yes'],
 		]));
@@ -510,11 +510,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertNull($result);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage password not accepted
-	 */
+	
 	public function testVerifyPasswordHookFails() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('password not accepted');
+
 		$this->config->method('getAppValue')->will($this->returnValueMap([
 				['core', 'shareapi_enforce_links_password', 'no', 'no'],
 		]));
@@ -719,11 +719,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertSame($exception, $thrown);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage You can’t share your root folder
-	 */
+	
 	public function testGeneralCheckShareRoot() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('You can’t share your root folder');
+
 		$thrown = null;
 
 		$this->userManager->method('userExists')->will($this->returnValueMap([
@@ -745,11 +745,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'generalCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\GenericShareException
-	 * @expectedExceptionMessage Expiration date is in the past
-	 */
+	
 	public function testvalidateExpirationDateInPast() {
+		$this->expectException(\OCP\Share\Exceptions\GenericShareException::class);
+		$this->expectExceptionMessage('Expiration date is in the past');
+
 
 		// Expire date in the past
 		$past = new \DateTime();
@@ -761,11 +761,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'validateExpirationDate', [$share]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Expiration date is enforced
-	 */
+	
 	public function testvalidateExpirationDateEnforceButNotSet() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Expiration date is enforced');
+
 		$share = $this->manager->newShare();
 		$share->setProviderId('foo')->setId('bar');
 
@@ -950,11 +950,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertEquals($save, $share->getExpirationDate());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage Invalid date!
-	 */
+	
 	public function testValidateExpirationDateHookException() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Invalid date!');
+
 		$nextWeek = new \DateTime();
 		$nextWeek->add(new \DateInterval('P7D'));
 		$nextWeek->setTime(0,0,0);
@@ -988,11 +988,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertEquals(null, $share->getExpirationDate());
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Sharing is only allowed with group members
-	 */
+	
 	public function testUserCreateChecksShareWithGroupMembersOnlyDifferentGroups() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Sharing is only allowed with group members');
+
 		$share = $this->manager->newShare();
 
 		$sharedBy = $this->createMock(IUser::class);
@@ -1061,11 +1061,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage  Path is already shared with this user
-	 */
+	
 	public function testUserCreateChecksIdenticalShareExists() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Path is already shared with this user');
+
 		$share  = $this->manager->newShare();
 		$share2 = $this->manager->newShare();
 
@@ -1086,11 +1086,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'userCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage  Path is already shared with this user
-	 */
+	
  	public function testUserCreateChecksIdenticalPathSharedViaGroup() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Path is already shared with this user');
+
 		$share  = $this->manager->newShare();
 
 		$sharedWith = $this->createMock(IUser::class);
@@ -1197,11 +1197,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Group sharing is now allowed
-	 */
+	
 	public function testGroupCreateChecksShareWithGroupMembersGroupSharingNotAllowed() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Group sharing is now allowed');
+
 		$share = $this->manager->newShare();
 
 		$this->config
@@ -1213,11 +1213,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'groupCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Sharing is only allowed within your own groups
-	 */
+	
 	public function testGroupCreateChecksShareWithGroupMembersOnlyNotInGroup() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Sharing is only allowed within your own groups');
+
 		$share = $this->manager->newShare();
 
 		$user = $this->createMock(IUser::class);
@@ -1239,11 +1239,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'groupCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Sharing is only allowed within your own groups
-	 */
+	
 	public function testGroupCreateChecksShareWithGroupMembersOnlyNullGroup() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Sharing is only allowed within your own groups');
+
 		$share = $this->manager->newShare();
 
 		$user = $this->createMock(IUser::class);
@@ -1292,11 +1292,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Path is already shared with this group
-	 */
+	
 	public function testGroupCreateChecksPathAlreadySharedWithSameGroup() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Path is already shared with this group');
+
 		$share = $this->manager->newShare();
 
 		$path = $this->createMock(Node::class);
@@ -1348,11 +1348,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Link sharing is not allowed
-	 */
+	
 	public function testLinkCreateChecksNoLinkSharesAllowed() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Link sharing is not allowed');
+
 		$share = $this->manager->newShare();
 
 		$this->config
@@ -1364,11 +1364,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'linkCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Link shares can’t have reshare permissions
-	 */
+	
 	public function testLinkCreateChecksSharePermissions() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Link shares can’t have reshare permissions');
+
 		$share = $this->manager->newShare();
 
 		$share->setPermissions(\OCP\Constants::PERMISSION_SHARE);
@@ -1382,11 +1382,11 @@ class ManagerTest extends \Test\TestCase {
 		self::invokePrivate($this->manager, 'linkCreateChecks', [$share]);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Public upload is not allowed
-	 */
+	
 	public function testLinkCreateChecksNoPublicUpload() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Public upload is not allowed');
+
 		$share = $this->manager->newShare();
 
 		$share->setPermissions(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);
@@ -1433,11 +1433,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Path contains files shared with you
-	 */
+	
 	public function testPathCreateChecksContainsSharedMount() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Path contains files shared with you');
+
 		$path = $this->createMock(Folder::class);
 		$path->method('getPath')->willReturn('path');
 
@@ -1924,11 +1924,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertEquals('token', $share->getToken());
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage I won't let you share
-	 */
+	
 	public function testCreateShareHookError() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('I won\'t let you share');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -2311,11 +2311,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertSame($share, $ret);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 * @expectedExceptionMessage The requested share does not exist anymore
-	 */
+	
 	public function testGetShareByTokenExpired() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+		$this->expectExceptionMessage('The requested share does not exist anymore');
+
 		$this->config
 			->expects($this->once())
 			->method('getAppValue')
@@ -2370,10 +2370,10 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertSame($share, $res);
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
-	 */
+	
 	public function testGetShareByTokenWithPublicLinksDisabled() {
+		$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
+
 		$this->config
 			->expects($this->once())
 			->method('getAppValue')
@@ -2466,11 +2466,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertTrue($this->manager->checkPassword($share, 'password'));
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Can’t change share type
-	 */
+	
 	public function testUpdateShareCantChangeShareType() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Can’t change share type');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -2492,11 +2492,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Can only update recipient on user shares
-	 */
+	
 	public function testUpdateShareCantChangeRecipientForGroupShare() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Can only update recipient on user shares');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -2520,11 +2520,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException Exception
-	 * @expectedExceptionMessage Can’t share with the share owner
-	 */
+	
 	public function testUpdateShareCantShareWithOwner() {
+		$this->expectException(\Exception::class);
+		$this->expectExceptionMessage('Can’t share with the share owner');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -2889,11 +2889,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password
-	 */
+	
 	public function testUpdateShareMailEnableSendPasswordByTalkWithNoPassword() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -2961,11 +2961,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password
-	 */
+	
 	public function testUpdateShareMailEnableSendPasswordByTalkRemovingPassword() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -3033,11 +3033,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password
-	 */
+	
 	public function testUpdateShareMailEnableSendPasswordByTalkRemovingPasswordWithEmptyString() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -3105,11 +3105,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password
-	 */
+	
 	public function testUpdateShareMailEnableSendPasswordByTalkWithPreviousPassword() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password');
+
 		$manager = $this->createManagerMock()
 			->setMethods([
 				'canShare',
@@ -3247,11 +3247,11 @@ class ManagerTest extends \Test\TestCase {
 		$manager->updateShare($share);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Can’t change target of link share
-	 */
+	
 	public function testMoveShareLink() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Can’t change target of link share');
+
 		$share = $this->manager->newShare();
 		$share->setShareType(\OCP\Share::SHARE_TYPE_LINK);
 
@@ -3260,11 +3260,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->manager->moveShare($share, $recipient);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Invalid recipient
-	 */
+	
 	public function testMoveShareUserNotRecipient() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid recipient');
+
 		$share = $this->manager->newShare();
 		$share->setShareType(\OCP\Share::SHARE_TYPE_USER);
 
@@ -3287,11 +3287,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Invalid recipient
-	 */
+	
 	public function testMoveShareGroupNotRecipient() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid recipient');
+
 		$share = $this->manager->newShare();
 		$share->setShareType(\OCP\Share::SHARE_TYPE_GROUP);
 
@@ -3307,11 +3307,11 @@ class ManagerTest extends \Test\TestCase {
 		$this->manager->moveShare($share, 'recipient');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Group "shareWith" does not exist
-	 */
+	
 	public function testMoveShareGroupNull() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Group "shareWith" does not exist');
+
 		$share = $this->manager->newShare();
 		$share->setShareType(\OCP\Share::SHARE_TYPE_GROUP);
 		$share->setSharedWith('shareWith');
diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php
index 2562f16e2a4..d2f5cd79284 100644
--- a/tests/lib/Share20/ShareHelperTest.php
+++ b/tests/lib/Share20/ShareHelperTest.php
@@ -37,7 +37,7 @@ class ShareHelperTest extends TestCase {
 	/** @var ShareHelper */
 	private $helper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->manager = $this->createMock(IManager::class);
diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php
index 45975d5996c..f7ea479350d 100644
--- a/tests/lib/Share20/ShareTest.php
+++ b/tests/lib/Share20/ShareTest.php
@@ -36,17 +36,17 @@ class ShareTest extends \Test\TestCase {
 	/** @var \OCP\Share\IShare */
 	protected $share;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->rootFolder = $this->createMock(IRootFolder::class);
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage String expected.
-	 */
+	
 	public function testSetIdInvalid() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('String expected.');
+
 		$this->share->setId(1.2);
 	}
 
@@ -61,20 +61,20 @@ class ShareTest extends \Test\TestCase {
 		$this->assertEquals('foo', $this->share->getId());
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException
-	 * @expectedExceptionMessage Not allowed to assign a new internal id to a share
-	 */
+	
 	public function testSetIdOnce() {
+		$this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class);
+		$this->expectExceptionMessage('Not allowed to assign a new internal id to a share');
+
 		$this->share->setId('foo');
 		$this->share->setId('bar');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage String expected.
-	 */
+	
 	public function testSetProviderIdInt() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('String expected.');
+
 		$this->share->setProviderId(42);
 	}
 
@@ -85,11 +85,11 @@ class ShareTest extends \Test\TestCase {
 		$this->assertEquals('foo:bar', $this->share->getFullId());
 	}
 
-	/**
-	 * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException
-	 * @expectedExceptionMessage Not allowed to assign a new provider id to a share
-	 */
+	
 	public function testSetProviderIdOnce() {
+		$this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class);
+		$this->expectExceptionMessage('Not allowed to assign a new provider id to a share');
+
 		$this->share->setProviderId('foo');
 		$this->share->setProviderId('bar');
 	}
diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php
index 67d4bd1eb2b..b2c15894391 100644
--- a/tests/lib/SubAdminTest.php
+++ b/tests/lib/SubAdminTest.php
@@ -41,7 +41,7 @@ class SubAdminTest extends \Test\TestCase {
 	/** @var \OCP\IGroup[] */
 	private $groups;
 	
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->users = [];
 		$this->groups = [];
 
@@ -83,7 +83,7 @@ class SubAdminTest extends \Test\TestCase {
 			->execute();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		foreach($this->users as $user) {
 			$user->delete();
 		}
diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php
index a2246bf1b1f..3793026be0f 100644
--- a/tests/lib/Support/Subscription/RegistryTest.php
+++ b/tests/lib/Support/Subscription/RegistryTest.php
@@ -46,10 +46,10 @@ class RegistryTest extends TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	/**
-	 * @expectedException \OCP\Support\Subscription\Exception\AlreadyRegisteredException
-	 */
+	
 	public function testDoubleRegistration() {
+		$this->expectException(\OCP\Support\Subscription\Exception\AlreadyRegisteredException::class);
+
 		/* @var ISubscription $subscription1 */
 		$subscription1 = $this->createMock(ISubscription::class);
 		/* @var ISubscription $subscription2 */
diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php
index 2eb52889ab0..a5a54fce09f 100644
--- a/tests/lib/SystemTag/SystemTagManagerTest.php
+++ b/tests/lib/SystemTag/SystemTagManagerTest.php
@@ -49,7 +49,7 @@ class SystemTagManagerTest extends TestCase {
 	 */
 	private $dispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -67,7 +67,7 @@ class SystemTagManagerTest extends TestCase {
 		$this->pruneTagsTables();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->pruneTagsTables();
 		parent::tearDown();
 	}
@@ -249,9 +249,10 @@ class SystemTagManagerTest extends TestCase {
 
 	/**
 	 * @dataProvider oneTagMultipleFlagsProvider
-	 * @expectedException \OCP\SystemTag\TagAlreadyExistsException
 	 */
 	public function testCreateDuplicate($name, $userVisible, $userAssignable) {
+		$this->expectException(\OCP\SystemTag\TagAlreadyExistsException::class);
+
 		try {
 			$this->tagManager->createTag($name, $userVisible, $userAssignable);
 		} catch (\Exception $e) {
@@ -282,25 +283,25 @@ class SystemTagManagerTest extends TestCase {
 		$this->assertSameTag($tag2, $tagList[$tag2->getId()]);
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testGetNonExistingTag() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagManager->getTag('nonexist', false, false);
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testGetNonExistingTagsById() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$tag1 = $this->tagManager->createTag('one', true, false);
 		$this->tagManager->getTagsByIds([$tag1->getId(), 100, 101]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetInvalidTagIdFormat() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$tag1 = $this->tagManager->createTag('one', true, false);
 		$this->tagManager->getTagsByIds([$tag1->getId() . 'suffix']);
 	}
@@ -359,9 +360,10 @@ class SystemTagManagerTest extends TestCase {
 
 	/**
 	 * @dataProvider updateTagProvider
-	 * @expectedException \OCP\SystemTag\TagAlreadyExistsException
 	 */
 	public function testUpdateTagDuplicate($tagCreate, $tagUpdated) {
+		$this->expectException(\OCP\SystemTag\TagAlreadyExistsException::class);
+
 		$this->tagManager->createTag(
 			$tagCreate[0],
 			$tagCreate[1],
@@ -391,10 +393,10 @@ class SystemTagManagerTest extends TestCase {
 		$this->assertEmpty($this->tagManager->getAllTags());
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testDeleteNonExistingTag() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagManager->deleteTags([100]);
 	}
 
diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
index 9c0545c241d..f0e535b0f67 100644
--- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php
+++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
@@ -64,7 +64,7 @@ class SystemTagObjectMapperTest extends TestCase {
 	 */
 	private $tag3;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -108,7 +108,7 @@ class SystemTagObjectMapperTest extends TestCase {
 		$this->tagMapper->assignTags('3', 'anothertype', $this->tag1->getId());
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->pruneTagsTables();
 		parent::tearDown();
 	}
@@ -166,10 +166,10 @@ class SystemTagObjectMapperTest extends TestCase {
 		], $objectIds);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetObjectsForTagsLimitWithMultipleTags() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->tagMapper->getObjectIdsForTags(
 			[$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()],
 			'testtype',
@@ -190,10 +190,10 @@ class SystemTagObjectMapperTest extends TestCase {
 		], $objectIds);
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testGetObjectsForNonExistingTag() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagMapper->getObjectIdsForTags(
 			[100],
 			'testtype'
@@ -228,10 +228,10 @@ class SystemTagObjectMapperTest extends TestCase {
 		$this->assertTrue(true, 'No error when reassigning/unassigning');
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testAssignNonExistingTags() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagMapper->assignTags('1', 'testtype', [100]);
 	}
 
@@ -255,10 +255,10 @@ class SystemTagObjectMapperTest extends TestCase {
 		], $tagIdMapping, 'None of the tags got assigned');
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testUnassignNonExistingTags() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagMapper->unassignTags('1', 'testtype', [100]);
 	}
 
@@ -386,10 +386,10 @@ class SystemTagObjectMapperTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \OCP\SystemTag\TagNotFoundException
-	 */
+	
 	public function testHaveTagNonExisting() {
+		$this->expectException(\OCP\SystemTag\TagNotFoundException::class);
+
 		$this->tagMapper->haveTag(
 			['1'],
 			'testtype',
diff --git a/tests/lib/Updater/ChangesCheckTest.php b/tests/lib/Updater/ChangesCheckTest.php
index b5aab5be65f..a979007573d 100644
--- a/tests/lib/Updater/ChangesCheckTest.php
+++ b/tests/lib/Updater/ChangesCheckTest.php
@@ -49,7 +49,7 @@ class ChangesCheckTest extends TestCase {
 	/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
 	protected $logger;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->clientService = $this->createMock(IClientService::class);
diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
index 911e883e99b..b25557d5569 100644
--- a/tests/lib/Updater/VersionCheckTest.php
+++ b/tests/lib/Updater/VersionCheckTest.php
@@ -33,7 +33,7 @@ class VersionCheckTest extends \Test\TestCase {
 	/** @var VersionCheck | \PHPUnit_Framework_MockObject_MockObject*/
 	private $updater;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->getMockBuilder(IConfig::class)
 			->disableOriginalConstructor()
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php
index 2df235b3840..1732cf4c1cf 100644
--- a/tests/lib/UpdaterTest.php
+++ b/tests/lib/UpdaterTest.php
@@ -40,7 +40,7 @@ class UpdaterTest extends TestCase {
 	/** @var Installer|\PHPUnit_Framework_MockObject_MockObject */
 	private $installer;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->getMockBuilder(IConfig::class)
 			->disableOriginalConstructor()
diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php
index 0582a7120b8..afde88e3995 100644
--- a/tests/lib/UrlGeneratorTest.php
+++ b/tests/lib/UrlGeneratorTest.php
@@ -28,7 +28,7 @@ class UrlGeneratorTest extends \Test\TestCase {
 	/** @var string */
 	private $originalWebRoot;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
@@ -41,7 +41,7 @@ class UrlGeneratorTest extends \Test\TestCase {
 		$this->originalWebRoot = \OC::$WEBROOT;
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		// Reset webRoot
 		\OC::$WEBROOT = $this->originalWebRoot;
 	}
diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php
index 202a8225f94..65d483734d9 100644
--- a/tests/lib/User/DatabaseTest.php
+++ b/tests/lib/User/DatabaseTest.php
@@ -82,11 +82,11 @@ class DatabaseTest extends Backend {
 		$this->assertSame($user, $this->backend->checkPassword($user, 'newpass'));
 	}
 
-	/**
-	 * @expectedException \OC\HintException
-	 * @expectedExceptionMessage password change failed
-	 */
+	
 	public function testVerifyPasswordEventFail() {
+		$this->expectException(\OC\HintException::class);
+		$this->expectExceptionMessage('password change failed');
+
 		$user = $this->getUser();
 		$this->backend->createUser($user, 'pass1');
 
diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php
index 4d70e30273a..58a6b550658 100644
--- a/tests/lib/User/ManagerTest.php
+++ b/tests/lib/User/ManagerTest.php
@@ -30,7 +30,7 @@ class ManagerTest extends TestCase {
 	/** @var EventDispatcherInterface */
 	private $dispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
@@ -367,10 +367,10 @@ class ManagerTest extends TestCase {
 		$this->assertEquals('foo', $user->getUID());
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testCreateUserSingleBackendExists() {
+		$this->expectException(\Exception::class);
+
 		/**
 		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
@@ -420,11 +420,11 @@ class ManagerTest extends TestCase {
 		$this->assertFalse($manager->createUser('foo', 'bar'));
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Could not create user
-	 */
+	
 	public function testCreateUserFromBackendWithBackendError() {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Could not create user');
+
 		/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */
 		$config = $this->createMock(IConfig::class);
 		/** @var \Test\Util\User\Dummy|\PHPUnit_Framework_MockObject_MockObject $backend */
@@ -439,10 +439,10 @@ class ManagerTest extends TestCase {
 		$manager->createUserFromBackend('MyUid', 'MyPassword', $backend);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testCreateUserTwoBackendExists() {
+		$this->expectException(\Exception::class);
+
 		/**
 		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
 		 */
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
index a9d466e5408..3567aa9cf62 100644
--- a/tests/lib/User/SessionTest.php
+++ b/tests/lib/User/SessionTest.php
@@ -271,10 +271,10 @@ class SessionTest extends \Test\TestCase {
 		$this->assertEquals($user, $userSession->getUser());
 	}
 
-	/**
-	 * @expectedException \OC\User\LoginException
-	 */
+	
 	public function testLoginValidPasswordDisabled() {
+		$this->expectException(\OC\User\LoginException::class);
+
 		$session = $this->getMockBuilder(Memory::class)->setConstructorArgs([''])->getMock();
 		$session->expects($this->never())
 			->method('set');
@@ -404,10 +404,10 @@ class SessionTest extends \Test\TestCase {
 		$userSession->login('foo', 'bar');
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\PasswordLoginForbiddenException
-	 */
+	
 	public function testLogClientInNoTokenPasswordWith2fa() {
+		$this->expectException(\OC\Authentication\Exceptions\PasswordLoginForbiddenException::class);
+
 		$manager = $this->createMock(Manager::class);
 		$session = $this->createMock(ISession::class);
 		$request = $this->createMock(IRequest::class);
@@ -508,10 +508,10 @@ class SessionTest extends \Test\TestCase {
 		$this->assertTrue($userSession->logClientIn('john', 'I-AM-AN-APP-PASSWORD', $request, $this->throttler));
 	}
 
-	/**
-	 * @expectedException \OC\Authentication\Exceptions\PasswordLoginForbiddenException
-	 */
+	
 	public function testLogClientInNoTokenPasswordNo2fa() {
+		$this->expectException(\OC\Authentication\Exceptions\PasswordLoginForbiddenException::class);
+
 		$manager = $this->createMock(Manager::class);
 		$session = $this->createMock(ISession::class);
 		$request = $this->createMock(IRequest::class);
@@ -973,10 +973,10 @@ class SessionTest extends \Test\TestCase {
 		$this->assertFalse($userSession->createSessionToken($request, $uid, $loginName, $password));
 	}
 
-	/**
-	 * @expectedException \OC\User\LoginException
-	 */
+	
 	public function testTryTokenLoginWithDisabledUser() {
+		$this->expectException(\OC\User\LoginException::class);
+
 		$manager = $this->getMockBuilder('\OC\User\Manager')
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php
index b4964e28206..0bf582727ff 100644
--- a/tests/lib/User/UserTest.php
+++ b/tests/lib/User/UserTest.php
@@ -33,7 +33,7 @@ class UserTest extends TestCase {
 	/** @var EventDispatcherInterface|MockObject */
 	protected $dispatcher;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
 	}