diff --git a/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java b/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java
index cfecc43b..09021f59 100644
--- a/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java
+++ b/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java
@@ -118,6 +118,30 @@ public void eventDtoTestNames() {
         assertEquals(DROUGHT.getName(), dto.getEventName());
     }
 
+    @Test
+    public void eventDtoTestEpisodeCount() {
+        EventApiEventDto event = testEvent();
+        EventListDto dto = EventDtoConverter.convert(event);
+        assertEquals(dto.getEpisodeCount(), 1);
+
+        //1. with 0 episodes
+        List<FeedEpisode> episodes = new ArrayList<>();
+        event.setEpisodes(episodes);
+        dto = EventDtoConverter.convert(event);
+        assertEquals(dto.getEpisodeCount(), 0);
+        
+        //2. with 2 episodes
+        FeedEpisode episode1 = new FeedEpisode();
+        FeedEpisode episode2 = new FeedEpisode();
+        episode1.setType(EventType.OTHER.toString());
+        episode2.setType(EventType.OTHER.toString());
+        episodes.add(episode1);
+        episodes.add(episode2);
+        event.setEpisodes(episodes);
+        dto = EventDtoConverter.convert(event);
+        assertEquals(dto.getEpisodeCount(), 2);
+    }
+
     @Test
     public void eventListDtoTestNulls() {
         EventApiEventDto event = testEvent();
@@ -198,7 +222,7 @@ public void eventListDtoTestEpisodeCount() {
         //1. with 0 episodes
         List<FeedEpisode> episodes = new ArrayList<>();
         event.setEpisodes(episodes);
-        EventListDto dto = EventListEventDtoConverter.convert(event);
+        dto = EventListEventDtoConverter.convert(event);
         assertEquals(dto.getEpisodeCount(), 0);
         
         //2. with 2 episodes