diff --git a/module/Common/src/Factory/EntityManagerFactory.php b/module/Common/src/Factory/EntityManagerFactory.php
index d6de017c..e42abb40 100644
--- a/module/Common/src/Factory/EntityManagerFactory.php
+++ b/module/Common/src/Factory/EntityManagerFactory.php
@@ -33,7 +33,7 @@ class EntityManagerFactory implements FactoryInterface
         $dbConfig = isset($globalConfig['database']) ? $globalConfig['database'] : [];
 
         return EntityManager::create($dbConfig, Setup::createAnnotationMetadataConfiguration(
-            ['src/Entity'],
+            ['module/Core/src/Entity'],
             $isDevMode,
             'data/proxies',
             $cache,
diff --git a/module/Core/test/Service/UrlShortenerTest.php b/module/Core/test/Service/UrlShortenerTest.php
index 0c4bae4d..f67086b5 100644
--- a/module/Core/test/Service/UrlShortenerTest.php
+++ b/module/Core/test/Service/UrlShortenerTest.php
@@ -65,7 +65,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\RuntimeException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\RuntimeException
      */
     public function exceptionIsThrownWhenOrmThrowsException()
     {
@@ -81,7 +81,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\InvalidUrlException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\InvalidUrlException
      */
     public function exceptionIsThrownWhenUrlDoesNotExist()
     {
@@ -126,7 +126,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\InvalidShortCodeException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\InvalidShortCodeException
      */
     public function invalidCharSetThrowsException()
     {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0721b191..61fefa13 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,10 @@
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite name="AcelayaTest">
-            <directory>./tests</directory>
+        <testsuite name="Common">
+            <directory>./module/Common/test</directory>
+        </testsuite>
+        <testsuite name="Core">
+            <directory>./module/Core/test</directory>
         </testsuite>
     </testsuites>