diff --git a/test/test-csys.lisp b/test/test-csys.lisp
index 7945db5..d61af67 100644
--- a/test/test-csys.lisp
+++ b/test/test-csys.lisp
@@ -56,7 +56,7 @@
       (tc:check-expected)
       (t:show-result))))
 
-(defun setup-test (cfg)
+(defun setup (cfg &key (delay 0.02))
   (setup-config)
   (core:setup-services)
   (destructuring-bind (prg &key (zero-cat :c00) (zero-val 0) eff-contacts) cfg
@@ -64,34 +64,33 @@
           (env (environ:create #'proc-env t:*test-suite* :eff-contacts eff-contacts)))
       (setf (tc:receiver t:*test-suite*) rcvr)
       (csys:create-zero prg env :categ (list :csys zero-cat) :value zero-val)
+      (sleep delay)
       env)))
 
+(defun teardown (&optional (delay 0.03))
+  (sleep delay)
+  (core:shutdown))
+
 ;;;; test definitions
  
 (deftest test-basic-0 ()
-  (let ((environ:*env* (setup-test (list (basic:prog-b0)))))
+  (let ((environ:*env* (setup (list (basic:prog-b0)))))
         ;(rcvr (tc:receiver t:*test-suite*))
-    (sleep 0.02)
     ;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1)))
     (environ:send-value '(:s00 "0-1") 1)
     (environ:send-value '(:s00 "0-1") 2)
-    (sleep 0.03)
-    (core:shutdown)))
+    (teardown)))
 
 (deftest test-basic-1 ()
-  (let ((environ:*env* (setup-test (basic:config-b1))))
-    (sleep 0.02)
+  (let ((environ:*env* (setup (basic:config-b1))))
     (environ:send-value '(:s01 "0-0") 1)
     (environ:send-value '(:s01 "0-1") 2)
-    (sleep 0.03)
-    (core:shutdown)))
+    (teardown)))
 
 (deftest test-basic-2 ()
-  (let ((environ:*env* (setup-test (basic:config-b2))))
-    (sleep 0.02)
+  (let ((environ:*env* (setup (basic:config-b2))))
     (environ:send-value '(:s02 "1-0") 1) (sleep 0.0001)
     (environ:send-value '(:s02 "1-1") 2) (sleep 0.0001) ;; 2 => loop
     (environ:send-value '(:s02 "1-0") 2) ;; stop loop
-    (sleep 0.03)
-    (core:shutdown)))
+    (teardown)))