diff --git a/src/mangadex/downloader.cr b/src/mangadex/downloader.cr
index cb74fa8..9424e6f 100644
--- a/src/mangadex/downloader.cr
+++ b/src/mangadex/downloader.cr
@@ -80,7 +80,7 @@ module MangaDex
 
   class Queue
     property downloader : Downloader?
-    @path : String = Config.current.mangadex["download_queue_db_path"].to_s
+    @path : String
 
     def self.default
       unless @@default
@@ -89,7 +89,8 @@ module MangaDex
       @@default.not_nil!
     end
 
-    def initialize
+    def initialize(db_path : String? = nil)
+      @path = db_path || Config.current.mangadex["download_queue_db_path"].to_s
       dir = File.dirname @path
       unless Dir.exists? dir
         Logger.info "The queue DB directory #{dir} does not exist. " \
diff --git a/src/storage.cr b/src/storage.cr
index 21cd5d3..e6057e9 100644
--- a/src/storage.cr
+++ b/src/storage.cr
@@ -13,7 +13,7 @@ def verify_password(hash, pw)
 end
 
 class Storage
-  @path : String = Config.current.db_path
+  @path : String
 
   def self.default
     unless @@default
@@ -22,7 +22,8 @@ class Storage
     @@default.not_nil!
   end
 
-  def initialize
+  def initialize(db_path : String? = nil)
+    @path = db_path || Config.current.db_path
     dir = File.dirname @path
     unless Dir.exists? dir
       Logger.info "The DB directory #{dir} does not exist. " \