diff --git a/test/agent/agent.scm b/test/agent/agent.scm
index 38877a50a30894f7092bfd9180e9570696b2ce4a..4e16d9075fcc4aeff6c75e6fbbc965f3ea0504fe 100644
--- a/test/agent/agent.scm
+++ b/test/agent/agent.scm
@@ -25,8 +25,8 @@
   #:export (ensure-account
             ensure-account-from-archive))
 
-(define-public account-id (make-fluid "afafafafafafafaf"))
-(define-public peer-id (make-fluid))
+(define-public account-id (make-parameter "afafafafafafafaf"))
+(define-public peer-id (make-parameter #f))
 
 (define* (ensure-account% this-account-id account-details #:optional (wait-for-announcement? #t))
   (if wait-for-announcement?
@@ -51,24 +51,24 @@
         (account:add account-details this-account-id)))
 
   (let ((details (account:get-details this-account-id)))
-    (fluid-set! peer-id (assoc-ref details "Account.username"))))
+    (peer-id (assoc-ref details "Account.username"))))
 
 (define* (ensure-account #:key (wait-for-announcement? #t))
   (jami:info "Ensure account")
-  (ensure-account% (fluid-ref account-id) '(("Account.type"            . "RING")
-                                            ("Account.displayName"     . "AGENT")
-                                            ("Account.alias"           . "AGENT")
-                                            ("Account.archivePassword" . "")
-                                            ("Account.archivePIN"      . "")
-                                            ("Account.archivePath"     . ""))
+  (ensure-account% (account-id) '(("Account.type"            . "RING")
+                                  ("Account.displayName"     . "AGENT")
+                                  ("Account.alias"           . "AGENT")
+                                  ("Account.archivePassword" . "")
+                                  ("Account.archivePIN"      . "")
+                                  ("Account.archivePath"     . ""))
                    wait-for-announcement?))
 
 (define* (ensure-account-from-archive path #:key (wait-for-announcement? #t))
   (jami:info "Ensure account from archive ~a" path)
-  (ensure-account% (fluid-ref account-id) `(("Account.type"            . "RING")
-                                            ("Account.displayName"     . "AGENT")
-                                            ("Account.alias"           . "AGENT")
-                                            ("Account.archivePassword" . "")
-                                            ("Account.archivePIN"      . "")
-                                            ("Account.archivePath"     . ,path))
+  (ensure-account% (account-id) `(("Account.type"            . "RING")
+                                  ("Account.displayName"     . "AGENT")
+                                  ("Account.alias"           . "AGENT")
+                                  ("Account.archivePassword" . "")
+                                  ("Account.archivePIN"      . "")
+                                  ("Account.archivePath"     . ,path))
                    wait-for-announcement?))
diff --git a/test/agent/examples/active-agent.scm b/test/agent/examples/active-agent.scm
index 9b1e55030119fde246a8e318c300b0e25f4187b3..0ba23daf5380e1b89b5c03a4a79c71911d0c4fa4 100644
--- a/test/agent/examples/active-agent.scm
+++ b/test/agent/examples/active-agent.scm
@@ -52,7 +52,7 @@
 
 (agent:ensure-account)
 
-(let ((account (fluid-ref agent:account-id))
+(let ((account (agent:account-id))
       (peer "FIXME"))
 
   (when (string= peer "FIXME")
diff --git a/test/agent/examples/passive-agent.scm b/test/agent/examples/passive-agent.scm
index d5124a8a41957bc6ca660ab982059b54c1194b9c..7e9befd2279aa735012eed69edcc736262c34751 100644
--- a/test/agent/examples/passive-agent.scm
+++ b/test/agent/examples/passive-agent.scm
@@ -10,9 +10,9 @@
 
 (agent:ensure-account)
 
-(jami:info "Agent peer-id: ~a" (fluid-ref agent:peer-id))
+(jami:info "Agent peer-id: ~a" (agent:peer-id))
 
-(let ((account (fluid-ref agent:account-id)))
+(let ((account (agent:account-id)))
   (jami:on-signal 'incoming-call/media
                   (lambda (account-id call-id peer media-lst)
                     (when (string= account-id account)
diff --git a/test/agent/scenarios/peer-monitor/scenario.scm b/test/agent/scenarios/peer-monitor/scenario.scm
index 6e4a985efacc3422d4c622e978aae82d07069a9a..04ff4c5c8c2fb32c3d9bc2195b64c402a05fad3b 100755
--- a/test/agent/scenarios/peer-monitor/scenario.scm
+++ b/test/agent/scenarios/peer-monitor/scenario.scm
@@ -65,7 +65,7 @@
 
                        (sigaction SIGALRM (lambda _ (setup-timer)))
 
-                       (let ((account (fluid-ref agent:account-id))
+                       (let ((account (agent:account-id))
                              (details (next-details!)))
                          (progress "SIGALRM - Changing account details: ~a" details)
                          (account:send-register account #f)
@@ -104,13 +104,13 @@
                                   #t))
                             #f)))
       (with-mutex mtx
-        (set! this-call-id (call:place-call (fluid-ref agent:account-id) peer))
+        (set! this-call-id (call:place-call (agent:account-id) peer))
         (let ((ret (wait-condition-variable cnd mtx
                                             (+ (current-time) timeout))))
           (unless ret (atomic-box-set! continue #f))
           ret))))
 
-  (let ((account (fluid-ref agent:account-id))
+  (let ((account (agent:account-id))
         (success 0)
         (failure 0)
         (reset (call/cc (lambda (k)