diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java
index 7193cbec89c4664a2df9135c5c5bbdb200b15ac6..8ecd78897ea4269cd9b08c411b369194dc09c75f 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java
@@ -89,7 +89,7 @@ class GameServiceImplTest {
         gameService.updateGameScore(game, 1, 0);
         assertThat(game.getHomeTeamScore()).isEqualTo(1);
         assertThat(game.getAwayTeamScore()).isEqualTo(0);
-        assertThat(game.getWinner().get()).isEqualTo(game.getHomeTeam());
+        assertThat(game.getWinner().orElse(null)).isEqualTo(game.getHomeTeam());
         verify(gameDao).update(game);
     }
 
@@ -99,7 +99,7 @@ class GameServiceImplTest {
         gameService.updateGameScore(game, 1, 2);
         assertThat(game.getHomeTeamScore()).isEqualTo(1);
         assertThat(game.getAwayTeamScore()).isEqualTo(2);
-        assertThat(game.getWinner().get()).isEqualTo(game.getAwayTeam());
+        assertThat(game.getWinner().orElse(null)).isEqualTo(game.getAwayTeam());
         verify(gameDao).update(game);
     }
 
@@ -119,7 +119,7 @@ class GameServiceImplTest {
         Team team = buildTeam("CSKA Moskva");
         game.setHomeTeam(team);
         gameService.setGameWinner(game, team);
-        assertThat(game.getWinner().get()).isEqualTo(team);
+        assertThat(game.getWinner().orElse(null)).isEqualTo(team);
         verify(gameDao).update(game);
     }
 
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImplTest.java
index 870214fd70a1b202654e45594620d4f0b18e4452..820078ea2360625413749465ac81ece9ae38af11 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImplTest.java
@@ -50,7 +50,7 @@ class PlayerServiceImplTest {
         Player player = buildPlayer(1L, "Jaromir Jagr");
         Team team = buildTeam(1L, "Florida Panthers");
         playerService.createPlayer(player, team);
-        assertThat(player.getTeam().get()).isSameAs(team);
+        assertThat(player.getTeam().orElse(null)).isSameAs(team);
         verify(playerDao).create(player);
     }
 
@@ -77,7 +77,7 @@ class PlayerServiceImplTest {
         Player player = buildPlayer(1L, "Jaromir Jagr");
         Team team = buildTeam(1L, "Florida Panthers");
         playerService.addTeamToPlayer(player, team);
-        assertThat(player.getTeam().get()).isSameAs(team);
+        assertThat(player.getTeam().orElse(null)).isSameAs(team);
         verify(playerDao).update(player);
     }