diff --git a/src/babashka/impl/clojure/spec/alpha.clj b/src/babashka/impl/clojure/spec/alpha.clj
index 9bbd916f..33d34a8f 100644
--- a/src/babashka/impl/clojure/spec/alpha.clj
+++ b/src/babashka/impl/clojure/spec/alpha.clj
@@ -324,7 +324,7 @@
     expr))
 
 (defn sci-resolve [sym]
-  (@sci.impl.utils/eval-resolve-state @ctx {} sym))
+  (sci/resolve @ctx sym))
 
 (defn res [form]
   (cond
@@ -669,7 +669,6 @@
         keys (mapv first pairs)
         pred-forms (mapv second pairs)
         pf (mapv res pred-forms)]
-    ;;(prn key-pred-forms)
     (c/assert (c/and (even? (count key-pred-forms)) (every? keyword? keys)) "cat expects k1 p1 k2 p2..., where ks are keywords")
     `(clojure.spec.alpha/cat-impl ~keys ~pred-forms '~pf)))
 
@@ -1581,12 +1580,12 @@
         nil p
         :clojure.spec.alpha/amp (list* 'clojure.spec.alpha/& amp forms)
         :clojure.spec.alpha/pcat (if rep+
-                 (list `+ rep+)
-                 (cons `cat (mapcat vector (c/or (seq ks) (repeat :_)) forms)))
+                 (list 'clojure.spec.alpha/+ rep+)
+                 (cons 'clojure.spec.alpha/cat (mapcat vector (c/or (seq ks) (repeat :_)) forms)))
         :clojure.spec.alpha/alt (if maybe
-                (list `? maybe)
-                (cons `alt (mapcat vector ks forms)))
-        :clojure.spec.alpha/rep (list (if splice `+ `*) forms)))))
+                (list 'clojure.spec.alpha/? maybe)
+                (cons 'clojure.spec.alpha/alt (mapcat vector ks forms)))
+        :clojure.spec.alpha/rep (list (if splice 'clojure.spec.alpha/+ 'clojure.spec.alpha/*) forms)))))
 
 (defn- op-explain [form p path via in input]
   ;;(prn {:form form :p p :path path :input input})
diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj
index 383ff561..6913ad36 100644
--- a/test-resources/lib_tests/babashka/run_all_libtests.clj
+++ b/test-resources/lib_tests/babashka/run_all_libtests.clj
@@ -7,8 +7,7 @@
    [clojure.java.io :as io]
    [clojure.spec.test.alpha :as st]
    [clojure.string :as str]
-   [clojure.test :as t :refer [*report-counters*]]
-   [orchestra.spec.test :as ot]))
+   [clojure.test :as t :refer [*report-counters*]]))
 
 #_(defmethod t/report :begin-test-var [m]
     (println "Running" (subs (str (-> m :var str)) 2)))
@@ -50,7 +49,7 @@
         (doseq [n namespaces]
           (let [orchestra? (str/starts-with? (str n) "orchestra")]
             (if orchestra?
-              (alter-var-root #'st/spec-checking-fn (constantly ot/spec-checking-fn))
+              nil ;; (alter-var-root #'st/spec-checking-fn (constantly ot/spec-checking-fn))
               (alter-var-root #'st/spec-checking-fn (constantly orig-spec-checking-fn)))
             (when-not orchestra?
               (require n)