diff --git a/lemonldap-ng-portal/t/66-CDA.t b/lemonldap-ng-portal/t/66-CDA.t
index c3208ff6c..1326bd477 100644
--- a/lemonldap-ng-portal/t/66-CDA.t
+++ b/lemonldap-ng-portal/t/66-CDA.t
@@ -13,9 +13,10 @@ my $res;
 my $client = LLNG::Manager::Test->new(
     {
         ini => {
-            logLevel    => 'error',
+            logLevel    => 'debug',
             useSafeJail => 1,
-            cda         => 1
+            cda         => 1,
+            logger      => 'Lemonldap::NG::Common::Logger::Std',
         }
     }
 );
@@ -45,7 +46,73 @@ ok(
 );
 count(1);
 
-($query) = expectRedirection( $res, qr#^http://test.example.org/\?(lemonldapcda=.*)$# );
+($query) =
+  expectRedirection( $res, qr#^http://test.example.org/\?(lemonldapcda=.*)$# );
+
+# Handler part
+use_ok('Lemonldap::NG::Handler::Server');
+use_ok('Lemonldap::NG::Common::PSGI::Cli::Lib');
+count(2);
+
+my ( $cli, $app );
+ok( $app = Lemonldap::NG::Handler::Server->run( $client->ini ), 'App' );
+count(1);
+
+ok(
+    $res = $app->(
+        {
+            'HTTP_ACCEPT'          => 'text/html',
+            'SCRIPT_NAME'          => '/',
+            'SERVER_NAME'          => '127.0.0.1',
+            'QUERY_STRING'         => $query,
+            'HTTP_CACHE_CONTROL'   => 'max-age=0',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
+            'PATH_INFO'            => '/',
+            'REQUEST_METHOD'       => 'GET',
+            'REQUEST_URI'          => "/?$query",
+            'X_ORIGINAL_URI'       => "/?$query",
+            'SERVER_PORT'          => '80',
+            'SERVER_PROTOCOL'      => 'HTTP/1.1',
+            'HTTP_USER_AGENT' =>
+              'Mozilla/5.0 (VAX-4000; rv:36.0) Gecko/20350101 Firefox',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'HTTP_HOST'   => 'test.example.org',
+            'VHOSTTYPE'   => 'CDA',
+        }
+    ),
+    'Push cda cookie'
+);
+count(1);
+expectRedirection( $res, 'http://test.example.org/' );
+my $cid = expectCookie($res);
+
+ok(
+    $res = $app->(
+        {
+            'HTTP_ACCEPT'          => 'text/html',
+            'SCRIPT_NAME'          => '/',
+            'SERVER_NAME'          => '127.0.0.1',
+            'HTTP_COOKIE'          => "lemonldap=$cid",
+            'HTTP_CACHE_CONTROL'   => 'max-age=0',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
+            'PATH_INFO'            => '/',
+            'REQUEST_METHOD'       => 'GET',
+            'REQUEST_URI'          => "/",
+            'X_ORIGINAL_URI'       => "/",
+            'SERVER_PORT'          => '80',
+            'SERVER_PROTOCOL'      => 'HTTP/1.1',
+            'HTTP_USER_AGENT' =>
+              'Mozilla/5.0 (VAX-4000; rv:36.0) Gecko/20350101 Firefox',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'HTTP_HOST'   => 'test.example.org',
+            'VHOSTTYPE'   => 'CDA',
+        }
+    ),
+    'Authenticated query'
+);
+count(1);
+expectOK($res);
+expectAuthenticatedAs( $res, 'dwho' );
 
 clean_sessions();