diff --git a/common/src/app/common/spec.cljc b/common/src/app/common/spec.cljc
index 76deea9f4d..28c40bb057 100644
--- a/common/src/app/common/spec.cljc
+++ b/common/src/app/common/spec.cljc
@@ -201,18 +201,18 @@
 
 (letfn [(conformer-fn [dest v]
           (cond
-            (coll? v) (into dest non-empty-strings-xf v)
+            (coll? v)   (into dest non-empty-strings-xf v)
             (string? v) (into dest non-empty-strings-xf (str/split v #"[\s,]+"))
             :else       ::s/invalid))
         (unformer-fn [v]
           (str/join "," v))]
   (s/def ::set-of-strings
-    (s/with-gen (s/conformer (partial conformer-fn #{}) unformer-fn)
-      #(tgen/set (s/gen ::not-empty-string))))
+    (-> (s/conformer (partial conformer-fn #{}) unformer-fn)
+        (s/with-gen #(tgen/set (s/gen ::not-empty-string)))))
 
   (s/def ::vector-of-strings
-    (s/with-gen (s/conformer (partial conformer-fn []) unformer-fn)
-      #(tgen/vector (s/gen ::not-empty-string)))))
+    (-> (s/conformer (partial conformer-fn []) unformer-fn)
+        (s/with-gen #(tgen/vector (s/gen ::not-empty-string))))))
 
 ;; --- SPEC: set-of-valid-emails