diff --git a/tests/LeanMapperQuery/Query.filters.phpt b/tests/LeanMapperQuery/Query.filters.phpt
index 66bbf30..4289574 100644
--- a/tests/LeanMapperQuery/Query.filters.phpt
+++ b/tests/LeanMapperQuery/Query.filters.phpt
@@ -54,7 +54,7 @@ class Author extends Entity
 
 class BookRepository extends Repository
 {
-	public function createFluent()
+	public function createFluent(): LeanMapper\Fluent
 	{
 		return parent::createFluent();
 	}
diff --git a/tests/LeanMapperQuery/Query.joins.phpt b/tests/LeanMapperQuery/Query.joins.phpt
index 9d2e4da..a85703a 100644
--- a/tests/LeanMapperQuery/Query.joins.phpt
+++ b/tests/LeanMapperQuery/Query.joins.phpt
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../bootstrap.php';
 
 class Test2Mapper extends TestMapper
 {
-	public function getPrimaryKey($table)
+	public function getPrimaryKey($table): string
 	{
 		if ($table === 'author') {
 			return 'id_author';
@@ -20,7 +20,7 @@ class Test2Mapper extends TestMapper
 		return 'id';
 	}
 
-	public function getRelationshipColumn($sourceTable, $targetTable)
+	public function getRelationshipColumn($sourceTable, $targetTable, ?string $relationshipName = NULL): string
 	{
 		return $targetTable . '_id';
 	}
diff --git a/tests/LeanMapperQuery/single-table-inheritance.phpt b/tests/LeanMapperQuery/single-table-inheritance.phpt
index 0f29ba2..66cc6d0 100644
--- a/tests/LeanMapperQuery/single-table-inheritance.phpt
+++ b/tests/LeanMapperQuery/single-table-inheritance.phpt
@@ -36,7 +36,7 @@ class BaseRepository extends Repository
 
 class ClientMapper extends TestMapper implements LeanMapperQuery\ICaster
 {
-	public function getEntityClass($table, LeanMapper\Row $row = null)
+	public function getEntityClass($table, LeanMapper\Row $row = null): string
 	{
 		if ($table === 'client') {
 			if (isset($row->type)) {
@@ -48,7 +48,7 @@ class ClientMapper extends TestMapper implements LeanMapperQuery\ICaster
 		return parent::getEntityClass($table, $row);
 	}
 
-	public function getTable($entity)
+	public function getTable($entity): string
 	{
 		if ($entity === 'ClientIndividual' || $entity === 'ClientCompany') {
 			return 'client';
@@ -93,7 +93,7 @@ abstract class Client extends BaseEntity
  */
 class ClientIndividual extends Client
 {
-	protected function initDefaults()
+	protected function initDefaults(): void
 	{
 		$this->type = self::TYPE_INDIVIDUAL;
 	}
@@ -105,7 +105,7 @@ class ClientIndividual extends Client
  */
 class ClientCompany extends Client
 {
-	protected function initDefaults()
+	protected function initDefaults(): void
 	{
 		$this->type = self::TYPE_COMPANY;
 	}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d5076a4..1a03b76 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,7 +16,10 @@
 
 class TestMapper extends DefaultMapper
 {
-	protected $defaultEntityNamespace = null;
+	public function __construct()
+	{
+		$this->defaultEntityNamespace = null;
+	}
 }
 
 $connection = new Connection([
diff --git a/tests/dependencies/Fluent.phpt b/tests/dependencies/Fluent.phpt
index 3ebc1e9..bcfff15 100644
--- a/tests/dependencies/Fluent.phpt
+++ b/tests/dependencies/Fluent.phpt
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../bootstrap.php';
 
 class TestRepository extends Repository
 {
-	public function createFluent()
+	public function createFluent(): LeanMapper\Fluent
 	{
 		return parent::createFluent();
 	}