diff --git a/cara/tests/apps/calculator/test_webapp.py b/cara/tests/apps/calculator/test_webapp.py
index e6b4eedf..fa5e37cc 100644
--- a/cara/tests/apps/calculator/test_webapp.py
+++ b/cara/tests/apps/calculator/test_webapp.py
@@ -2,11 +2,12 @@ from pathlib import Path
 
 import pytest
 import tornado.testing
+from retry import retry
 
 import cara.apps.calculator
 from cara.apps.calculator.report_generator import generate_permalink
 
-_TIMEOUT = 30.
+_TIMEOUT = 20.
 
 @pytest.fixture
 def app():
@@ -42,6 +43,7 @@ async def test_404(http_server_client):
     assert resp.code == 404
 
 
+@retry()
 class TestBasicApp(tornado.testing.AsyncHTTPTestCase):
     def get_app(self):
         return cara.apps.calculator.make_app()
@@ -70,6 +72,7 @@ class TestBasicApp(tornado.testing.AsyncHTTPTestCase):
         assert 'expected number of new cases is' in response.body.decode()
 
 
+@retry()
 class TestCernApp(tornado.testing.AsyncHTTPTestCase):
     def get_app(self):
         cern_theme = Path(cara.apps.calculator.__file__).parent.parent / 'themes' / 'cern'
@@ -82,6 +85,7 @@ class TestCernApp(tornado.testing.AsyncHTTPTestCase):
         assert 'expected number of new cases is' in response.body.decode()
 
 
+retry()
 class TestOpenApp(tornado.testing.AsyncHTTPTestCase):
     def get_app(self):
         return cara.apps.calculator.make_app(calculator_prefix="/mycalc")