diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index 95d30addfde234502d4a839d85cd5a028f36b657..4862f5e1d929abe00c72827a92e5a55dd97e145a 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -85,10 +85,8 @@ class LoginTest extends ClearStateTestCase
         $response = $c->login($request);
 
         $this->assertInstanceOf(RunnableResponse::class, $response);
-        list($object, $method) = $response->getCallable();
+        $this->assertIsCallable($response->getCallable());
 
-        $this->assertInstanceOf(Simple::class, $object);
-        $this->assertEquals('login', $method);
         $arguments = $response->getArguments();
         $this->assertArrayHasKey('ErrorURL', $arguments[0]);
         $this->assertArrayHasKey('ReturnTo', $arguments[0]);
@@ -196,14 +194,15 @@ class LoginTest extends ClearStateTestCase
     {
         $asConfig = Configuration::loadFromArray($this->authSources);
         Configuration::setPreLoadedConfig($asConfig, 'authsources.php');
+
         $session = Session::getSessionFromRequest();
         $factory = new AuthenticationFactory($this->config, $session);
+
         $c = new Controller\Login($this->config, $session, $factory);
         $response = $c->logout('example-userpass');
+
         $this->assertInstanceOf(RunnableResponse::class, $response);
-        list($object, $method) = $response->getCallable();
-        $this->assertInstanceOf(Simple::class, $object);
-        $this->assertEquals('logout', $method);
+        $this->assertIsCallable($response->getCallable());
         $this->assertEquals('/simplesaml/', $response->getArguments()[0]);
     }