diff --git a/events/tests/test_views.py b/events/tests/test_views.py
index 34ca27831..613a6ee46 100644
--- a/events/tests/test_views.py
+++ b/events/tests/test_views.py
@@ -116,6 +116,8 @@ def test_event_list(self):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context['object_list']), 6)
+        self.assertIn('upcoming_events', response.context)
+        self.assertEqual(list(response.context['upcoming_events']), list(response.context['object_list']))
 
         url = reverse('events:event_list_past', kwargs={"calendar_slug": 'unexisting'})
         response = self.client.get(url)
diff --git a/events/views.py b/events/views.py
index 56df88dcb..40e2ee81f 100644
--- a/events/views.py
+++ b/events/views.py
@@ -87,6 +87,7 @@ def get_context_data(self, **kwargs):
         context['events_today'] = Event.objects.until_datetime(timezone.now()).filter(
             calendar__slug=self.kwargs['calendar_slug'])[:2]
         context['calendar'] = get_object_or_404(Calendar, slug=self.kwargs['calendar_slug'])
+        context['upcoming_events'] = self.get_queryset()
         return context