diff --git a/tests/conftest.py b/tests/conftest.py
index c8c50a94cc..e381cff9e4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -40,11 +40,13 @@ def _wait_for_app(app: Application, timeout: int = app_start_timeout):
 
     while not success and time.time() - start_time < timeout:
         try:
-            response = requests.get(f'http://localhost:{http.port}/')
+            response = requests.get(
+                f'http://localhost:{http.port}/', timeout=1, allow_redirects=False
+            )
             response.raise_for_status()
             success = True
         except Exception as e:
-            logging.debug('App not ready yet: %s', e)
+            logging.info('App not ready yet: %s', e)
             time.sleep(1)
 
     assert success, f'App not ready after {timeout} seconds'
diff --git a/tests/test_http.py b/tests/test_http.py
index 090cd2b995..b5d9eb3952 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -5,12 +5,12 @@ from .utils import register_user, send_request as _send_request
 
 @pytest.fixture(scope='module')
 def expected_registration_redirect(base_url):
-    yield '{base_url}/register?redirect={base_url}/execute'.format(base_url=base_url)
+    yield f'{base_url}/auth?type=register&redirect={base_url}/execute'
 
 
 @pytest.fixture(scope='module')
 def expected_login_redirect(base_url):
-    yield '{base_url}/login?redirect={base_url}/execute'.format(base_url=base_url)
+    yield f'{base_url}/auth?type=login&redirect={base_url}/execute'
 
 
 def send_request(**kwargs):
@@ -34,18 +34,14 @@ def test_first_user_registration(base_url):
     """
     response = register_user()
 
-    assert len(response.history) > 0, 'Redirect missing from the history'
-    assert (
-        'session_token' in response.history[0].cookies
+    assert response.json().get('status') == 'ok' and response.json().get(
+        'session_token'
     ), 'No session_token returned upon registration'
-    assert (
-        '{base_url}/'.format(base_url=base_url) == response.url
-    ), 'The registration form did not redirect to the main panel'
 
 
 def test_unauthorized_request_with_registered_user(base_url, expected_login_redirect):
     """
-    After a first user has been registered any unauthenticated call to /execute should redirect to /login.
+    After a first user has been registered any unauthenticated call to /execute should redirect to /auth.
     """
     response = send_request(authenticate=False, parse_json=False)
     assert response.status_code == 401, (
diff --git a/tests/utils.py b/tests/utils.py
index 586606c2b3..29e7e2d6f7 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -48,7 +48,7 @@ def send_request(
     args: Optional[dict] = None,
     parse_json: bool = True,
     authenticate: bool = True,
-    **kwargs
+    **kwargs,
 ):
     if not timeout:
         timeout = request_timeout
@@ -58,14 +58,15 @@ def send_request(
     auth = (test_user, test_pass) if authenticate else kwargs.pop('auth', ())
     set_timeout(seconds=timeout, on_timeout=on_timeout('Receiver response timed out'))
     response = requests.post(
-        '{}/execute'.format(base_url),
+        f'{base_url}/execute',
         auth=auth,
+        timeout=10,
         json={
             'type': 'request',
             'action': action,
             'args': args,
         },
-        **kwargs
+        **kwargs,
     )
 
     clear_timeout()
@@ -85,7 +86,7 @@ def register_user(username: Optional[str] = None, password: Optional[str] = None
         on_timeout=on_timeout('User registration response timed out'),
     )
     response = requests.post(
-        '{base_url}/register?redirect={base_url}/'.format(base_url=base_url),
+        f'{base_url}/auth?type=register&redirect={base_url}/',
         data={
             'username': username,
             'password': password,
@@ -106,7 +107,7 @@ def on_timeout(msg):
 
 def parse_response(response):
     response = Message.build(response.json())
-    assert isinstance(response, Response), 'Expected Response type, got {}'.format(
-        response.__class__.__name__
-    )
+    assert isinstance(
+        response, Response
+    ), f'Expected Response type, got {response.__class__.__name__}'
     return response