         (is (thrown-with-msg?
               IllegalArgumentException
               #"Invalid service graph;"
-              (trapperkeeper/bootstrap* (parse-bootstrap-config! bootstrap-config)))))))
+              (parse-and-bootstrap bootstrap-config))))))
 
   (testing "CLI arg parsing"
     (testing "CLI args are parsed to a map"

            [puppetlabs.testutils.logging :refer [with-test-logging with-test-logging-debug]]
            [puppetlabs.utils.classpath :refer [with-additional-classpath-entries]]))

(deftest test-bootstrapping
  (testing "Valid bootstrap configurations"
    (let [bootstrap-config    "

        (is (thrown-with-msg?
              IllegalArgumentException
              #"(?is)Invalid line in bootstrap.*This is not a legit line"
              (parse-and-bootstrap bootstrap-config)))))

    (testing "Bootstrap config file is empty."
      (let [bootstrap-config (StringReader. "")]
        (is (thrown-with-msg?
              Exception
              #"Empty bootstrap config file"
        (parse-and-bootstrap bootstrap-config)))))

    (testing "Service namespace doesn't exist"
      (let [bootstrap-config (StringReader.
