diff --git a/module/Core/test/Visit/Paginator/Adapter/NonOrphanVisitsPaginatorAdapterTest.php b/module/Core/test/Visit/Paginator/Adapter/NonOrphanVisitsPaginatorAdapterTest.php
new file mode 100644
index 00000000..4c4c00e5
--- /dev/null
+++ b/module/Core/test/Visit/Paginator/Adapter/NonOrphanVisitsPaginatorAdapterTest.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Core\Visit\Paginator\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\Repository\VisitRepositoryInterface;
+use Shlinkio\Shlink\Core\Visit\Paginator\Adapter\NonOrphanVisitsPaginatorAdapter;
+use Shlinkio\Shlink\Core\Visit\Persistence\VisitsCountFiltering;
+use Shlinkio\Shlink\Core\Visit\Persistence\VisitsListFiltering;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
+
+class NonOrphanVisitsPaginatorAdapterTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private NonOrphanVisitsPaginatorAdapter $adapter;
+    private ObjectProphecy $repo;
+    private VisitsParams $params;
+    private ApiKey $apiKey;
+
+    protected function setUp(): void
+    {
+        $this->repo = $this->prophesize(VisitRepositoryInterface::class);
+        $this->params = VisitsParams::fromRawData([]);
+        $this->apiKey = ApiKey::create();
+
+        $this->adapter = new NonOrphanVisitsPaginatorAdapter($this->repo->reveal(), $this->params, $this->apiKey);
+    }
+
+    /** @test */
+    public function countDelegatesToRepository(): void
+    {
+        $expectedCount = 5;
+        $repoCount = $this->repo->countNonOrphanVisits(
+            new VisitsCountFiltering($this->params->getDateRange(), $this->params->excludeBots(), $this->apiKey),
+        )->willReturn($expectedCount);
+
+        $result = $this->adapter->getNbResults();
+
+        self::assertEquals($expectedCount, $result);
+        $repoCount->shouldHaveBeenCalledOnce();
+    }
+
+    /**
+     * @test
+     * @dataProvider provideLimitAndOffset
+     */
+    public function getSliceDelegatesToRepository(int $limit, int $offset): void
+    {
+        $visitor = Visitor::emptyInstance();
+        $list = [Visit::forRegularNotFound($visitor), Visit::forInvalidShortUrl($visitor)];
+        $repoFind = $this->repo->findNonOrphanVisits(new VisitsListFiltering(
+            $this->params->getDateRange(),
+            $this->params->excludeBots(),
+            $this->apiKey,
+            $limit,
+            $offset,
+        ))->willReturn($list);
+
+        $result = $this->adapter->getSlice($offset, $limit);
+
+        self::assertEquals($list, $result);
+        $repoFind->shouldHaveBeenCalledOnce();
+    }
+
+    public function provideLimitAndOffset(): iterable
+    {
+        yield [1, 5];
+        yield [10, 4];
+        yield [30, 18];
+    }
+}
diff --git a/module/Core/test/Visit/Paginator/Adapter/VisitsPaginatorAdapterTest.php b/module/Core/test/Visit/Paginator/Adapter/ShortUrlVisitsPaginatorAdapterTest.php
similarity index 97%
rename from module/Core/test/Visit/Paginator/Adapter/VisitsPaginatorAdapterTest.php
rename to module/Core/test/Visit/Paginator/Adapter/ShortUrlVisitsPaginatorAdapterTest.php
index 41b873df..04e17bc6 100644
--- a/module/Core/test/Visit/Paginator/Adapter/VisitsPaginatorAdapterTest.php
+++ b/module/Core/test/Visit/Paginator/Adapter/ShortUrlVisitsPaginatorAdapterTest.php
@@ -16,7 +16,7 @@ use Shlinkio\Shlink\Core\Visit\Persistence\VisitsCountFiltering;
 use Shlinkio\Shlink\Core\Visit\Persistence\VisitsListFiltering;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 
-class VisitsPaginatorAdapterTest extends TestCase
+class ShortUrlVisitsPaginatorAdapterTest extends TestCase
 {
     use ProphecyTrait;
 
diff --git a/module/Core/test/Visit/VisitsStatsHelperTest.php b/module/Core/test/Visit/VisitsStatsHelperTest.php
index 7d9a06b9..731697e6 100644
--- a/module/Core/test/Visit/VisitsStatsHelperTest.php
+++ b/module/Core/test/Visit/VisitsStatsHelperTest.php
@@ -174,4 +174,23 @@ class VisitsStatsHelperTest extends TestCase
         $countVisits->shouldHaveBeenCalledOnce();
         $getRepo->shouldHaveBeenCalledOnce();
     }
+
+    /** @test */
+    public function nonOrphanVisitsAreReturnedAsExpected(): void
+    {
+        $list = map(range(0, 3), fn () => Visit::forValidShortUrl(ShortUrl::createEmpty(), Visitor::emptyInstance()));
+        $repo = $this->prophesize(VisitRepository::class);
+        $countVisits = $repo->countNonOrphanVisits(Argument::type(VisitsCountFiltering::class))->willReturn(
+            count($list),
+        );
+        $listVisits = $repo->findNonOrphanVisits(Argument::type(VisitsListFiltering::class))->willReturn($list);
+        $getRepo = $this->em->getRepository(Visit::class)->willReturn($repo->reveal());
+
+        $paginator = $this->helper->nonOrphanVisits(new VisitsParams());
+
+        self::assertEquals($list, ArrayUtils::iteratorToArray($paginator->getCurrentPageResults()));
+        $listVisits->shouldHaveBeenCalledOnce();
+        $countVisits->shouldHaveBeenCalledOnce();
+        $getRepo->shouldHaveBeenCalledOnce();
+    }
 }