diff --git a/examples/log2-vpi-common-vpi/vpi_log2.utest b/examples/log2-vpi-common-vpi/vpi_log2.utest
index acf6f64..922a814 100644
--- a/examples/log2-vpi-common-vpi/vpi_log2.utest
+++ b/examples/log2-vpi-common-vpi/vpi_log2.utest
@@ -4,22 +4,20 @@
 
 (let ((top "vpi_log2"))
   ;; compile VPI module in the base directory
-  (if (utest/iverilog-compile-vpi "vpi_log2.c"
-                                  #:output-dir (utest/base-path)
-                                  #:name top #:libs "m")
-      (map
-       (lambda (arg)
-         (utest/tb
-          ((format "log2_~a" arg))
+  (and (utest/iverilog-compile-vpi "vpi_log2.c"
+                                   #:output-dir (utest/base-path)
+                                   #:name top #:libs "m")
+       (map
+        (lambda (arg)
+          (utest/tb
+           ((format "log2_~a" arg))
 
-          (utest/run-simulation-iverilog
-           "vpi_log2.sv"
-           top
+           (utest/run-simulation-iverilog
+            "vpi_log2.sv"
+            top
 
-           #:parameters          `((ARGUMENT ,arg))
-           #:vpimods             top
-           ;; VPI modules search path
-           #:vpipaths            (utest/base-path))))
-       (iota 20))
-
-      #f))
+            #:parameters `((ARGUMENT ,arg))
+            #:vpimods    top
+            ;; VPI modules search path
+            #:vpipaths   (utest/base-path))))
+        (iota 20))))
diff --git a/examples/log2-vpi/vpi_log2.utest b/examples/log2-vpi/vpi_log2.utest
index d101f83..f9ce42e 100644
--- a/examples/log2-vpi/vpi_log2.utest
+++ b/examples/log2-vpi/vpi_log2.utest
@@ -8,12 +8,10 @@
      (utest/tb
       ((format "log2_~a" arg))
 
-      (if (utest/iverilog-compile-vpi "vpi_log2.c" #:name top #:libs "m")
-          (utest/run-simulation-iverilog
-           "vpi_log2.sv"
-           top
-           #:parameters          `((ARGUMENT ,arg))
-           #:vpimods             top)
-
-          #f)))
+      (and (utest/iverilog-compile-vpi "vpi_log2.c" #:name top #:libs "m")
+           (utest/run-simulation-iverilog
+            "vpi_log2.sv"
+            top
+            #:parameters `((ARGUMENT ,arg))
+            #:vpimods    top))))
    (iota 20)))