diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index a34d968b06a4427832882a5079dc4619171788c6..7a5ab066e7e2e991e0e0d9de650f4e5e19885cd9 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -80,10 +80,15 @@
   (= @metabase-initialization-progress 1.0))
 
 (defn initialization-progress
-  "Metabase is initialized and ready to be served"
+  "Get the current progress of the Metabase initialize"
   []
   @metabase-initialization-progress)
 
+(defn initialization-complete!
+  "Complete the Metabase initialization by setting its progress to 100%"
+  []
+  (reset! metabase-initialization-progress 1.0))
+
 (defn- -init-create-setup-token
   "Create and set a new setup token, and open the setup URL on the user's system."
   []
@@ -147,7 +152,7 @@
       (sample-data/update-sample-dataset-if-needed!)))
 
   (log/info "Metabase Initialization COMPLETE")
-  (reset! metabase-initialization-progress 1.0)
+  (initialization-complete!)
   true)
 
 
diff --git a/test/metabase/test_setup.clj b/test/metabase/test_setup.clj
index f7a7d62c8b12a3fbfebb50eedf60f5e77b3c6d9c..fd03ef4fd75e00dc197ee68548cb3880f74ca596 100644
--- a/test/metabase/test_setup.clj
+++ b/test/metabase/test_setup.clj
@@ -82,7 +82,8 @@
   (let [setup-db (future (time (do (log/info "Setting up test DB and running migrations...")
                                    (db/setup-db :auto-migrate true)
                                    (load-test-datasets)
-                                   (metabase.models.setting/set :site-name "Metabase Test"))))]
+                                   (metabase.models.setting/set :site-name "Metabase Test")
+                                   (core/initialization-complete!))))]
     (core/start-jetty)
     @setup-db))