diff --git a/tests/Integration/Controller/RegisterControllerTest.php b/tests/Integration/Controller/RegisterControllerTest.php
index 6b310e6..2690e75 100644
--- a/tests/Integration/Controller/RegisterControllerTest.php
+++ b/tests/Integration/Controller/RegisterControllerTest.php
@@ -2,6 +2,7 @@
 
 namespace OCA\Registration\Tests\Integration\Controller;
 
+use OCA\Registration\Controller\RegisterController;
 use OCA\Registration\Db\RegistrationMapper;
 use OCA\Registration\Service\MailService;
 use OCA\Registration\Service\RegistrationService;
diff --git a/tests/Integration/Service/RegistrationServiceTest.php b/tests/Integration/Service/RegistrationServiceTest.php
index 72392ca..e1f8c7f 100644
--- a/tests/Integration/Service/RegistrationServiceTest.php
+++ b/tests/Integration/Service/RegistrationServiceTest.php
@@ -5,6 +5,7 @@ namespace OCA\Registration\Tests\Integration\Service;
 use OCA\Registration\Db\Registration;
 use OCA\Registration\Db\RegistrationMapper;
 use OCA\Registration\Service\MailService;
+use OCA\Registration\Service\RegistrationException;
 use OCA\Registration\Service\RegistrationService;
 use OCP\Defaults;
 use OCP\IConfig;
@@ -133,11 +134,11 @@ class RegistrationServiceTest extends TestCase {
 	}
 	/**
 	 * @depends testValidateNewEmailWithinAllowedDomain
-	 * @expectedException OCA\Registration\Service\RegistrationException
 	 */
 	public function testValidateNewEmailNotWithinAllowedDomain() {
 		$email2 = 'bbbb@gmail.com';
 
+		$this->expectException(RegistrationException::class);
 		$this->service->validateEmail($email2);
 	}
 
@@ -155,11 +156,11 @@ class RegistrationServiceTest extends TestCase {
 	}
 	/**
 	 * @depends testValidateNewEmailWithinMultipleAllowedDomain
-	 * @expectedException OCA\Registration\Service\RegistrationException
 	 */
 	public function testValidateNewEmailNotWithinMultipleAllowedDomain() {
 		$email2 = 'cccc@yahoo.com';
 
+		$this->expectException(RegistrationException::class);
 		$this->service->validateEmail($email2);
 	}
 
@@ -213,7 +214,6 @@ class RegistrationServiceTest extends TestCase {
 
 	/**
 	 * @depends testCreateAccountWebForm
-	 * @expectedException OCA\Registration\Service\RegistrationException
 	 */
 	public function testDuplicateUsernameWebForm() {
 		$reg = new Registration();
@@ -223,6 +223,7 @@ class RegistrationServiceTest extends TestCase {
 		//$reg->setPassword("asdf");
 		$reg->setEmailConfirmed(true);
 
+		$this->expectException(RegistrationException::class);
 		$resulting_user = $this->service->createAccount($reg, 'alice1', 'asdf');
 	}
 
@@ -236,7 +237,6 @@ class RegistrationServiceTest extends TestCase {
 
 	/**
 	 * @depends testCreateAccountWebForm
-	 * @expectedException OCA\Registration\Service\RegistrationException
 	 */
 	public function testDuplicateUsernameApi() {
 		$reg = new Registration();
@@ -246,6 +246,7 @@ class RegistrationServiceTest extends TestCase {
 		$reg->setPassword("asdf");
 		$reg->setEmailConfirmed(true);
 
+		$this->expectException(RegistrationException::class);
 		$resulting_user = $this->service->createAccount($reg);
 	}
 
diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
index 2f0221f..f4b3351 100644
--- a/tests/Unit/Controller/ApiControllerTest.php
+++ b/tests/Unit/Controller/ApiControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace OCA\Registration\Tests\Unit\Controller;
 
+use OCA\Registration\Controller\ApiController;
 use OCA\Registration\Db\Registration;
 use OCA\Registration\Service\MailService;
 use OCA\Registration\Service\RegistrationService;
diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index 941d68e..dbdf50d 100644
--- a/tests/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -3,7 +3,7 @@
 		 verbose="true"
 		>
 	<testsuite name='Registration app tests'>
-		<directory suffix='Test.php'>integration</directory>
+		<directory suffix='Test.php'>Integration</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
 	<filter>
diff --git a/tests/phpunit.unit.xml b/tests/phpunit.unit.xml
index 1b5554d..c56ee9e 100644
--- a/tests/phpunit.unit.xml
+++ b/tests/phpunit.unit.xml
@@ -3,7 +3,7 @@
 		 verbose="true"
 		>
 	<testsuite name='Registration app tests'>
-		<directory suffix='Test.php'>unit</directory>
+		<directory suffix='Test.php'>Unit</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
 	<filter>