diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77ade648..7c22e54a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ A preview of the next release can be installed from
 - [#1596](https://github.com/babashka/babashka/issues/1596): Fix `clojure.java.browse/browse-url` truncates URLs with multiple query parameters on Windows
 - [#1599](https://github.com/babashka/babashka/issues/1599): propagate error from `run` when task does not exist
 - Bump clj-yaml to `1.0.27`
+- #1604: throw `FileNotFoundException` when requiring namespace whose file cannot be found (as JVM Clojure does)
+- Bump integrant CI tests
 
 ## 1.3.182 (2023-07-20)
 
diff --git a/deps.edn b/deps.edn
index 3710fbde..e12869b0 100644
--- a/deps.edn
+++ b/deps.edn
@@ -109,7 +109,7 @@
                          exoscale/coax {:mvn/version "1.0.0-alpha14"}
                          orchestra/orchestra {:mvn/version "2021.01.01-1"}
                          expound/expound {:mvn/version "0.8.10"}
-                         integrant/integrant {:mvn/version "0.8.0"}
+                         integrant/integrant {:git/url "https://github.com/weavejester/integrant", :git/sha "a9fd7c02bd7201f36344b47142badc3c3ef22f88"}
                          com.stuartsierra/dependency {:mvn/version "1.0.0"}
                          listora/again {:mvn/version "1.0.0"}
                          org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index f1602e8a..76ed9676 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -868,7 +868,7 @@ Use bb run --help to show this help output.
                          abs-path))
             _ (when jar
                 (cp/add-classpath jar))
-            load-fn (fn [{:keys [:namespace :reload]}]
+            load-fn (fn [{:keys [namespace reload ctx]}]
                       (let [loader @cp/the-url-loader]
                         (or
                          (when ;; ignore built-in namespaces when uberscripting, unless with :reload
@@ -912,7 +912,9 @@ Use bb run --help to show this help output.
                            clojure.core.specs.alpha
                            (binding [*out* *err*]
                              (println "[babashka] WARNING: clojure.core.specs.alpha is removed from the classpath, unless you explicitly add the dependency."))
-                           nil))))
+                           (when-not (sci/find-ns ctx namespace)
+                             (let [file (str/replace (namespace-munge namespace) "." "/")]
+                               (throw (new java.io.FileNotFoundException (format "Could not locate %s.bb, %s.clj or %s.cljc on classpath." file file file)))))))))
             main (if (and jar (not main))
                    (when-let [res (cp/getResource
                                    (cp/new-loader [jar])
diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn
index 7441a13b..3dd050a2 100644
--- a/test-resources/lib_tests/bb-tested-libs.edn
+++ b/test-resources/lib_tests/bb-tested-libs.edn
@@ -94,7 +94,8 @@
  progrock/progrock {:git-url "https://github.com/weavejester/progrock", :test-namespaces (progrock.core-test), :git-sha "9c277a3244c52bfde19c21add327d6e20b94fdf5"}
  ;; Don't run portal.jvm-test as it depends on headless chrome
  djblue/portal {:git-url "https://github.com/djblue/portal", :test-namespaces (portal.test-runner portal.runtime.cson-test portal.runtime.fs-test portal.e2e portal.bench), :git-sha "64e4624bcf3bee2dd47e3d8e47982c709738eb11"}
- integrant/integrant {:git-url "https://github.com/weavejester/integrant", :test-namespaces (integrant.test.foo integrant.test.quz integrant.test.bar integrant.test.baz integrant.core-test), :git-sha "32a46f5dca8a6b563a6dddf88bec887be3201b08"}
+ integrant/integrant {:git-url "https://github.com/weavejester/integrant", :test-namespaces (integrant.test.foo integrant.test.quz integrant.test.bar integrant.test.baz integrant.core-test), :git-sha "a9fd7c02bd7201f36344b47142badc3c3ef22f88"
+                      :test-paths ["test"]}
  com.wsscode/cljc-misc {:git-url "https://github.com/wilkerlucio/cljc-misc", :test-namespaces (com.wsscode.misc.uuid-test com.wsscode.misc.macros-test com.wsscode.misc.math-test com.wsscode.misc.coll-test com.wsscode.misc.refs-test), :git-sha "dc8e31a200f9cacf86af10b63e40fcb448c259f4"}
  edn-query-language/eql {:git-url "https://github.com/edn-query-language/eql", :test-namespaces (edn-query-language.core-test), :git-sha "0d4f9745d98c3d20b81bb4bdce3e8e15db7fd094"}
  meta-merge/meta-merge {:git-url "https://github.com/weavejester/meta-merge", :test-namespaces (meta-merge.core-test), :git-sha "c968c38baccd4219fe0ba592d89af37ea8e426bf"}
diff --git a/test-resources/lib_tests/integrant/core_test.cljc b/test-resources/lib_tests/integrant/core_test.cljc
deleted file mode 100644
index ceeb60f7..00000000
--- a/test-resources/lib_tests/integrant/core_test.cljc
+++ /dev/null
@@ -1,549 +0,0 @@
-(ns integrant.core-test
-  (:require [clojure.spec.alpha :as s]
-   #?(:clj  [clojure.test :refer :all]
-      :cljs [cljs.test :refer-macros [are deftest is testing]])
-            [integrant.core :as ig]
-            [weavejester.dependency :as dep]))
-
-(def log (atom []))
-
-(defmethod ig/prep-key ::p [_ v]
-  (merge {:a (ig/ref ::a)} v))
-
-(defmethod ig/init-key :default [k v]
-  (swap! log conj [:init k v])
-  [v])
-
-(defmethod ig/init-key ::x [k v]
-  (swap! log conj [:init k v])
-  :x)
-
-(defmethod ig/init-key ::error-init [_ _]
-  (throw (ex-info "Testing" {:reason ::test})))
-
-(defmethod ig/init-key ::k [_ v] v)
-
-(defmethod ig/init-key ::n [_ v] (inc v))
-(defmethod ig/pre-init-spec ::n [_] nat-int?)
-
-(defmethod ig/init-key ::r [_ v] {:v v})
-(defmethod ig/resolve-key ::r [_ {:keys [v]}] v)
-(defmethod ig/resume-key ::r [k v _ _] (ig/init-key k v))
-
-(defmethod ig/halt-key! :default [k v]
-  (swap! log conj [:halt k v]))
-
-(defmethod ig/halt-key! ::error-halt [_ _]
-  (throw (ex-info "Testing" {:reason ::test})))
-
-(defmethod ig/resume-key :default [k cfg cfg' sys]
-  (swap! log conj [:resume k cfg cfg' sys])
-  [cfg])
-
-(defmethod ig/resume-key ::x [k cfg cfg' sys]
-  (swap! log conj [:resume k cfg cfg' sys])
-  :rx)
-
-(defmethod ig/suspend-key! :default [k v]
-  (swap! log conj [:suspend k v]))
-
-(derive ::p ::pp)
-(derive ::pp ::ppp)
-
-(derive ::ap ::a)
-(derive ::ap ::p)
-
-(deftest ref-test
-  (is (ig/ref? (ig/ref ::foo)))
-  (is (ig/ref? (ig/ref [::foo ::bar])))
-  (is (ig/reflike? (ig/ref ::foo)))
-  (is (ig/reflike? (ig/ref [::foo ::bar]))))
-
-(deftest refset-test
-  (is (ig/refset? (ig/refset ::foo)))
-  (is (ig/refset? (ig/refset [::foo ::bar])))
-  (is (ig/reflike? (ig/refset ::foo)))
-  (is (ig/reflike? (ig/refset [::foo ::bar]))))
-
-(deftest composite-keyword-test
-  (let [k (ig/composite-keyword [::a ::b])]
-    (is (isa? k ::a))
-    (is (isa? k ::b))
-    (is (identical? k (ig/composite-keyword [::a ::b])))
-    (is (not= k (ig/composite-keyword [::a ::c])))))
-
-(deftest valid-config-key-test
-  (is (ig/valid-config-key? ::a))
-  (is (not (ig/valid-config-key? :a))))
-
-(deftest expand-test
-  (is (= (ig/expand {::a (ig/ref ::b), ::b 1})
-         {::a 1, ::b 1}))
-  (is (= (ig/expand {::a (ig/ref ::b), ::b (ig/ref ::c), ::c 2})
-         {::a 2, ::b 2, ::c 2}))
-  (is (= (ig/expand {::a (ig/ref ::pp), ::p 1})
-         {::a 1, ::p 1}))
-  (is (= (ig/expand {::a (ig/refset ::ppp), ::p 1, ::pp 2})
-         {::a #{1 2}, ::p 1, ::pp 2}))
-  (is (= (ig/expand {::a (ig/refset ::ppp)})
-         {::a #{}})))
-
-#?(:clj
-   (deftest read-string-test
-     (is (= (ig/read-string "{:foo/a #ig/ref :foo/b, :foo/b 1}")
-            {:foo/a (ig/ref :foo/b), :foo/b 1}))
-     (is (= (ig/read-string "{:foo/a #ig/refset :foo/b, :foo/b 1}")
-            {:foo/a (ig/refset :foo/b), :foo/b 1}))
-     (is (= (ig/read-string {:readers {'test/var find-var}}
-                            "{:foo/a #test/var clojure.core/+}")
-            {:foo/a #'+}))))
-
-;; BB-TEST-PATCH: No *loaded-libs* in bb
-#?(:bb :TODO :clj
-   (defn- remove-lib [lib]
-     (remove-ns lib)
-     (dosync (alter @#'clojure.core/*loaded-libs* disj lib))))
-
-(derive :integrant.test-child/foo :integrant.test/foo)
-
-;; BB-TEST-PATCH: No *loaded-libs* in bb
-#?(:bb :TODO
-   :clj
-   (deftest load-namespaces-test
-     (testing "all namespaces"
-       (remove-lib 'integrant.test.foo)
-       (remove-lib 'integrant.test.bar)
-       (remove-lib 'integrant.test.baz)
-       (remove-lib 'integrant.test.quz)
-       (is (= (set (ig/load-namespaces {:integrant.test/foo                     1
-                                        :integrant.test.bar/wuz                 2
-                                        [:integrant.test/baz :integrant.test/x] 3
-                                        [:integrant.test/y :integrant.test/quz] 4}))
-              '#{integrant.test.foo
-                 integrant.test.bar
-                 integrant.test.baz
-                 integrant.test.quz}))
-       (is (some? (find-ns 'integrant.test.foo)))
-       (is (some? (find-ns 'integrant.test.bar)))
-       (is (some? (find-ns 'integrant.test.baz)))
-       (is (some? (find-ns 'integrant.test.quz)))
-       (is (= (some-> 'integrant.test.foo/message find-var var-get) "foo"))
-       (is (= (some-> 'integrant.test.bar/message find-var var-get) "bar"))
-       (is (= (some-> 'integrant.test.baz/message find-var var-get) "baz"))
-       (is (= (some-> 'integrant.test.quz/message find-var var-get) "quz")))
-
-     (testing "some namespaces"
-       (remove-lib 'integrant.test.foo)
-       (remove-lib 'integrant.test.bar)
-       (remove-lib 'integrant.test.baz)
-       (remove-lib 'integrant.test.quz)
-       (is (= (set (ig/load-namespaces
-                    {:integrant.test/foo 1
-                     :integrant.test/bar (ig/ref :integrant.test/foo)
-                     :integrant.test/baz 3}
-                    [:integrant.test/bar]))
-              '#{integrant.test.foo
-                 integrant.test.bar}))
-       (is (some? (find-ns 'integrant.test.foo)))
-       (is (some? (find-ns 'integrant.test.bar)))
-       (is (nil?  (find-ns 'integrant.test.baz))))
-
-     (testing "load namespaces of ancestors"
-       (remove-lib 'integrant.test.foo)
-       (is (= (set (ig/load-namespaces
-                    {:integrant.test-child/foo 1}))
-              '#{integrant.test.foo}))
-       (is (some? (find-ns 'integrant.test.foo))))))
-
-
-(deftest dependency-graph-test
-  (let [m {::a (ig/ref ::p), ::b (ig/refset ::ppp) ::p 1, ::pp 2}]
-    (testing "graph with refsets"
-      (let [g (ig/dependency-graph m)]
-        (is (dep/depends? g ::a ::p))
-        (is (dep/depends? g ::b ::p))
-        (is (dep/depends? g ::b ::pp))))
-
-    (testing "graph without refsets"
-      (let [g (ig/dependency-graph m {:include-refsets? false})]
-        (is (dep/depends? g ::a ::p))
-        (is (not (dep/depends? g ::b ::p)))
-        (is (not (dep/depends? g ::b ::pp)))))))
-
-(deftest key-comparator-test
-  (let [graph (ig/dependency-graph {::a (ig/ref ::ppp) ::p 1, ::b 2})]
-    (is (= (sort (ig/key-comparator graph) [::b ::a ::p])
-           [::p ::a ::b]))))
-
-(deftest derived-from?-test
-  (are [a b] (ig/derived-from? a b)
-    ::p           ::p
-    ::p           ::pp
-    ::p           ::ppp
-    ::ap          [::a ::p]
-    ::ap          [::a ::pp]
-    [::a ::p]     [::a ::pp]
-    [::a ::b ::p] [::a ::ppp]))
-
-(deftest find-derived-1-test
-  (testing "missing key"
-    (is (nil? (ig/find-derived-1 {} ::p))))
-
-  (testing "derived key"
-    (is (= (ig/find-derived-1 {::a "x" ::p "y"} ::pp)
-           [::p "y"])))
-
-  (testing "ambiguous key"
-    (is (thrown-with-msg?
-         #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-         (re-pattern (str "Ambiguous key: " ::pp "\\. "
-                          "Found multiple candidates: " ::p ", " ::pp))
-         (ig/find-derived-1 {::a "x" ::p "y", ::pp "z"} ::pp))))
-
-  (testing "composite key"
-    (is (= (ig/find-derived-1 {::a "x" [::b ::x] "y"} ::x)
-           [[::b ::x] "y"]))))
-
-(deftest find-derived-test
-  (testing "missing key"
-    (is (nil? (ig/find-derived {} ::p))))
-
-  (testing "derived key"
-    (is (= (ig/find-derived {::a "x" ::p "y" ::pp "z"} ::pp)
-           [[::p "y"] [::pp "z"]])))
-
-  (testing "ambiguous key"
-    (is (= (ig/find-derived {::a "x" ::p "y" ::pp "z"} ::ppp)
-           [[::p "y"] [::pp "z"]])))
-
-  (testing "composite key"
-    (is (= (ig/find-derived {::a "x" [::b ::x] "y", [::b ::y] "z"} ::b)
-           [[[::b ::x] "y"] [[::b ::y] "z"]]))))
-
-(deftest prep-test
-  (testing "default"
-    (is (= (ig/prep {::q {:b 2}, ::a 1})
-           {::q {:b 2}, ::a 1})))
-
-  (testing "custom prep-key"
-    (is (= (ig/prep {::p {:b 2}, ::a 1})
-           {::p {:a (ig/ref ::a), :b 2}, ::a 1})))
-
-  (testing "prep then init"
-    (is (= (ig/init (ig/prep {::p {:b 2}, ::a 1}))
-           {::p [{:a [1], :b 2}], ::a [1]}))))
-
-(deftest init-test
-  (testing "without keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), ::b 1})]
-      (is (= m {::a [[1]], ::b [1]}))
-      (is (= @log [[:init ::b 1]
-                   [:init ::a [1]]]))))
-
-  (testing "with keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), ::b 1, ::c 2} [::a])]
-      (is (= m {::a [[1]], ::b [1]}))
-      (is (= @log [[:init ::b 1]
-                   [:init ::a [1]]]))))
-
-  (testing "with inherited keys"
-    (reset! log [])
-    (let [m (ig/init {::p (ig/ref ::a), ::a 1} [::pp])]
-      (is (= m {::p [[1]], ::a [1]}))
-      (is (= @log [[:init ::a 1]
-                   [:init ::p [1]]]))))
-
-  (testing "with composite keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), [::x ::b] 1})]
-      (is (= m {::a [:x], [::x ::b] :x}))
-      (is (= @log [[:init [::x ::b] 1]
-                   [:init ::a :x]]))))
-
-  (testing "with composite refs"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref [::b ::c]), [::b ::c ::e] 1, [::b ::d] 2})]
-      (is (= m {::a [[1]], [::b ::c ::e] [1], [::b ::d] [2]}))
-      (is (or (= @log [[:init [::b ::c ::e] 1]
-                       [:init ::a [1]]
-                       [:init [::b ::d] 2]])
-              (= @log [[:init [::b ::d] 2]
-                       [:init [::b ::c ::e] 1]
-                       [:init ::a [1]]])))))
-
-  (testing "with failing composite refs"
-    (reset! log [])
-    (is (thrown-with-msg?
-          #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-          #"^Invalid composite key: \[:integrant.core-test/a :b\]. Every keyword must be namespaced.$"
-          (ig/init {[::a :b] :anything}))))
-
-  (testing "with custom resolve-key"
-    (let [m (ig/init {::a (ig/ref ::r), ::r 1})]
-      (is (= m {::a [1], ::r {:v 1}}))))
-
-  (testing "with refsets"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/refset ::ppp), ::p 1, ::pp 2})]
-      (is (= m {::a [#{[1] [2]}], ::p [1], ::pp [2]}))
-      (is (= @log [[:init ::p 1]
-                   [:init ::pp 2]
-                   [:init ::a #{[1] [2]}]]))))
-
-  (testing "with refsets and keys"
-    (reset! log [])
-    (let [m {::a (ig/refset ::ppp), ::p 1, ::pp 2}]
-      (is (= (ig/init m [::a])      {::a [#{}]}))
-      (is (= (ig/init m [::a ::p])  {::a [#{[1]}] ::p [1]}))
-      (is (= (ig/init m [::a ::pp]) {::a [#{[1] [2]}] ::p [1] ::pp [2]}))))
-
-  (testing "large config"
-    (is (= (ig/init {:a/a1 {} :a/a2 {:_ (ig/ref :a/a1)}
-                     :a/a3 {} :a/a4 {} :a/a5 {}
-                     :a/a6 {} :a/a7 {} :a/a8 {}
-                     :a/a9 {} :a/a10 {}})
-           {:a/a1 [{}] :a/a2 [{:_ [{}]}]
-            :a/a3 [{}] :a/a4 [{}] :a/a5 [{}]
-            :a/a6 [{}] :a/a7 [{}] :a/a8 [{}]
-            :a/a9 [{}] :a/a10 [{}]})))
-
-  (testing "with passing specs"
-    (let [m (ig/init {::n (ig/ref ::k), ::k 1})]
-      (is (= m {::n 2, ::k 1}))))
-
-  (testing "with failing specs"
-    (is (thrown-with-msg?
-         #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-         (re-pattern (str "Spec failed on key " ::n " when building system"))
-         (ig/init {::n (ig/ref ::k), ::k 1.1}))))
-
-  (testing "with failing composite specs"
-    (is (thrown-with-msg?
-         #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-         (re-pattern (str "Spec failed on key \\[" ::n " " ::nnn "\\] when building system"))
-         (ig/init {[::n ::nnn] 1.1})))))
-
-(deftest halt-test
-  (testing "without keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), ::b 1})]
-      (ig/halt! m)
-      (is (= @log [[:init ::b 1]
-                   [:init ::a [1]]
-                   [:halt ::a [[1]]]
-                   [:halt ::b [1]]]))))
-
-  (testing "with keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), ::b (ig/ref ::c), ::c 1})]
-      (ig/halt! m [::a])
-      (is (= @log [[:init ::c 1]
-                   [:init ::b [1]]
-                   [:init ::a [[1]]]
-                   [:halt ::a [[[1]]]]]))
-      (reset! log [])
-      (ig/halt! m [::c])
-      (is (= @log [[:halt ::a [[[1]]]]
-                   [:halt ::b [[1]]]
-                   [:halt ::c [1]]]))))
-
-  (testing "with partial system"
-    (reset! log [])
-    (let [m (ig/init {::a 1, ::b (ig/ref ::a)} [::a])]
-      (ig/halt! m)
-      (is (= @log [[:init ::a 1]
-                   [:halt ::a [1]]]))))
-
-  (testing "with inherited keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::p), ::p 1} [::a])]
-      (ig/halt! m [::pp])
-      (is (= @log [[:init ::p 1]
-                   [:init ::a [1]]
-                   [:halt ::a [[1]]]
-                   [:halt ::p [1]]]))))
-
-  (testing "with composite keys"
-    (reset! log [])
-    (let [m (ig/init {::a (ig/ref ::b), [::x ::b] 1})]
-      (ig/halt! m)
-      (is (= @log [[:init [::x ::b] 1]
-                   [:init ::a :x]
-                   [:halt ::a [:x]]
-                   [:halt [::x ::b] :x]])))))
-
-(deftest suspend-resume-test
-  (testing "same configuration"
-    (reset! log [])
-    (let [c  {::a (ig/ref ::b), ::b 1}
-          m  (ig/init c)
-          _  (ig/suspend! m)
-          m' (ig/resume c m)]
-      (is (= @log [[:init ::b 1]
-                   [:init ::a [1]]
-                   [:suspend ::a [[1]]]
-                   [:suspend ::b [1]]
-                   [:resume ::b 1 1 [1]]
-                   [:resume ::a [1] [1] [[1]]]]))))
-
-  (testing "missing keys"
-    (reset! log [])
-    (let [c  {::a (ig/ref ::b), ::b 1}
-          m  (ig/init c)
-          _  (ig/suspend! m)
-          m' (ig/resume (dissoc c ::a) m)]
-      (is (= @log [[:init ::b 1]
-                   [:init ::a [1]]
-                   [:suspend ::a [[1]]]
-                   [:suspend ::b [1]]
-                   [:halt ::a [[1]]]
-                   [:resume ::b 1 1 [1]]]))))
-
-  (testing "missing refs"
-    (reset! log [])
-    (let [c  {::a {:b (ig/ref ::b)}, ::b 1}
-          m  (ig/init c)
-          _  (ig/suspend! m)
-          m' (ig/resume {::a []} m)]
-      (is (= @log [[:init ::b 1]
-                   [:init ::a {:b [1]}]
-                   [:suspend ::a [{:b [1]}]]
-                   [:suspend ::b [1]]
-                   [:halt ::b [1]]
-                   [:resume ::a [] {:b [1]} [{:b [1]}]]]))))
-
-  (testing "with custom resolve-key"
-    (let [c  {::a (ig/ref ::r), ::r 1}
-          m  (ig/init c)
-          _  (ig/suspend! m)
-          m' (ig/resume c m)]
-      (is (= m m'))))
-
-  (testing "composite keys"
-    (reset! log [])
-    (let [c  {::a (ig/ref ::x), [::b ::x] 1}
-          m  (ig/init c)
-          _  (ig/suspend! m)
-          m' (ig/resume c m)]
-      (is (= @log [[:init [::b ::x] 1]
-                   [:init ::a :x]
-                   [:suspend ::a [:x]]
-                   [:suspend [::b ::x] :x]
-                   [:resume [::b ::x] 1 1 :x]
-                   [:resume ::a :rx :x [:x]]]))))
-
-  (testing "resume key with dependencies"
-    (reset! log [])
-    (let [c  {::a {:b (ig/ref ::b)}, ::b 1}
-          m  (ig/init c [::a])
-          _  (ig/suspend! m)
-          m' (ig/resume c m [::a])]
-      (is (= @log
-             [[:init ::b 1]
-              [:init ::a {:b [1]}]
-              [:suspend ::a [{:b [1]}]]
-              [:suspend ::b [1]]
-              [:resume ::b 1 1 [1]]
-              [:resume ::a {:b [1]} {:b [1]} [{:b [1]}]]])))))
-
-(deftest invalid-configs-test
-  (testing "ambiguous refs"
-    (is (thrown-with-msg?
-         #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-         (re-pattern (str "Ambiguous key: " ::ppp "\\. "
-                          "Found multiple candidates: "
-                          "(" ::p ", " ::pp "|" ::pp ", " ::p ")"))
-         (ig/init {::a (ig/ref ::ppp), ::p 1, ::pp 2}))))
-
-  (testing "missing refs"
-    (is (thrown-with-msg?
-         #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo)
-         (re-pattern (str "Missing definitions for refs: " ::b))
-         (ig/init {::a (ig/ref ::b)}))))
-
-  (testing "missing refs with explicit keys"
-    (is (= (ig/init {::a (ig/ref ::ppp), ::p 1, ::pp 2} [::p ::pp])
-           {::p [1], ::pp [2]})))
-
-  (testing "missing refs with explicit keys"
-    (is (= (ig/init {::a 1, ::b (ig/ref ::c)} [::a])
-           {::a [1]}))))
-
-(defn build-log [config]
-  (let [log (atom [])]
-    [(ig/build config (keys config) (fn [k v] (last (swap! log conj [:build k v]))))
-     @log]))
-
-(deftest build-test
-  (is (= [{::a [:build ::a [:build ::b 1]]
-           ::b [:build ::b 1]}
-          [[:build ::b 1]
-           [:build ::a [:build ::b 1]]]]
-         (build-log {::a (ig/ref ::b)
-                     ::b 1}))))
-
-(defn test-log [f m]
-  (let [log (atom [])]
-    [(f m (keys m) (fn [k v] (last (swap! log conj [:test k v]))))
-     @log]))
-
-(deftest run-test* ;; BB-TEST-PATCH: renamed due to conflict with clojure.test
-  (let [config {::a (ig/ref ::b), ::b 1}
-        [system _] (build-log config)]
-    (is (= [nil
-            [[:test ::b [:build ::b 1]]
-             [:test ::a [:build ::a [:build ::b 1]]]]]
-           (test-log ig/run! system)))
-    (is (= [nil
-            [[:test ::a [:build ::a [:build ::b 1]]]
-             [:test ::b [:build ::b 1]]]]
-           (test-log ig/reverse-run! system)))))
-
-(deftest fold-test
-  (let [config {::a (ig/ref ::ppp), ::b (ig/ref ::pp), ::p 1, ::c 2}
-        system (ig/init config)]
-    (is (= (ig/fold system #(conj %1 [%2 %3]) [])
-           [[::p [1]] [::a [[1]]] [::b [[1]]] [::c [2]]]))))
-
-(deftest wrapped-exception-test
-  (testing "exception when building"
-    (let [ex (try (ig/init {::a 1, ::error-init (ig/ref ::a)}) nil
-                  (catch #?(:clj Throwable :cljs :default) t t))]
-      (is (some? ex))
-      (is (= (#?(:clj .getMessage :cljs ex-message) ex)
-             (str "Error on key " ::error-init " when building system")))
-      (is (= (ex-data ex)
-             {:reason   ::ig/build-threw-exception
-              :system   {::a [1]}
-              :function ig/init-key
-              :key      ::error-init
-              :value    [1]}))
-      (let [cause (#?(:clj .getCause :cljs ex-cause) ex)]
-        (is (some? cause))
-        (is (= (#?(:clj .getMessage :cljs ex-message) cause) "Testing"))
-        (is (= (ex-data cause) {:reason ::test})))))
-
-  (testing "exception when running"
-    (let [system (ig/init {::a 1
-                           ::error-halt (ig/ref ::a)
-                           ::b (ig/ref ::error-halt)
-                           ::c (ig/ref ::b)})
-          ex     (try (ig/halt! system)
-                      (catch #?(:clj Throwable :cljs :default) t t))]
-      (is (some? ex))
-      (is (= (#?(:clj .getMessage :cljs ex-message) ex)
-             (str "Error on key " ::error-halt " when running system")))
-      (is (= (ex-data ex)
-             {:reason         ::ig/run-threw-exception
-              :system         {::a [1], ::error-halt [[1]], ::b [[[1]]], ::c [[[[1]]]]}
-              :completed-keys '(::c ::b)
-              :remaining-keys '(::a)
-              :function       ig/halt-key!
-              :key            ::error-halt
-              :value          [[1]]}))
-      (let [cause (#?(:clj .getCause :cljs ex-cause) ex)]
-        (is (some? cause))
-        (is (= (#?(:clj .getMessage :cljs ex-message) cause) "Testing"))
-        (is (= (ex-data cause) {:reason ::test}))))))
diff --git a/test-resources/lib_tests/integrant/test/bar.clj b/test-resources/lib_tests/integrant/test/bar.clj
deleted file mode 100644
index e24dec6a..00000000
--- a/test-resources/lib_tests/integrant/test/bar.clj
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns integrant.test.bar)
-
-(def message "bar")
diff --git a/test-resources/lib_tests/integrant/test/baz.clj b/test-resources/lib_tests/integrant/test/baz.clj
deleted file mode 100644
index bf565ab7..00000000
--- a/test-resources/lib_tests/integrant/test/baz.clj
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns integrant.test.baz)
-
-(def message "baz")
diff --git a/test-resources/lib_tests/integrant/test/foo.clj b/test-resources/lib_tests/integrant/test/foo.clj
deleted file mode 100644
index 3d9ab7d5..00000000
--- a/test-resources/lib_tests/integrant/test/foo.clj
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns integrant.test.foo)
-
-(def message "foo")
diff --git a/test-resources/lib_tests/integrant/test/quz.clj b/test-resources/lib_tests/integrant/test/quz.clj
deleted file mode 100644
index 7ebd2a8b..00000000
--- a/test-resources/lib_tests/integrant/test/quz.clj
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns integrant.test.quz)
-
-(def message "quz")
diff --git a/test-resources/lib_tests/integrant/test_runner.cljs b/test-resources/lib_tests/integrant/test_runner.cljs
deleted file mode 100644
index 8e014182..00000000
--- a/test-resources/lib_tests/integrant/test_runner.cljs
+++ /dev/null
@@ -1,5 +0,0 @@
-(ns integrant.test-runner
-  (:require [doo.runner :refer-macros [doo-tests]]
-            [integrant.core-test]))
-
-(doo-tests 'integrant.core-test)
diff --git a/test/babashka/classpath_test.clj b/test/babashka/classpath_test.clj
index 68481bfc..dbdaaa3a 100644
--- a/test/babashka/classpath_test.clj
+++ b/test/babashka/classpath_test.clj
@@ -18,7 +18,7 @@
   (is (= "hello from foo\n"
          (tu/bb nil "--prn" "--classpath" "test-resources/babashka/src_for_classpath_test/foo.jar"
                 "(require '[foo :as f]) (f/foo)")))
-  (is (thrown-with-msg? Exception #"not find"
+  (is (thrown-with-msg? Exception #"not locate"
          (tu/bb nil
                 "(require '[foo :as f])"))))
 
diff --git a/test/babashka/namespace_test.clj b/test/babashka/namespace_test.clj
index 7d8b1f5b..1e825b24 100644
--- a/test/babashka/namespace_test.clj
+++ b/test/babashka/namespace_test.clj
@@ -23,3 +23,9 @@
     {:containing-ns ns-ns-name
      :ns-on-var     var-ns-name
      :var-name      var-symbol}))")))))
+
+(deftest reload-existing-ns-test
+  (is (bb nil "(require '[clojure.java.io] :reload) true")))
+
+(deftest file-not-found-exception-non-existing-ns-test
+  (is (= :user/dude (bb nil "(try (require '[foo-dude.bar]) (catch java.io.FileNotFoundException _ ::dude))"))))