diff --git a/docs/changelog.txt b/docs/changelog.txt
index 70e55aff58..0c29a14396 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -65,8 +65,10 @@ Template for new versions:
 ## Documentation
 
 ## API
+- Core: added ``getConfigPath()`` API for obtaining the path to user-specific configuration files
 
 ## Lua
+- Added ``dfhack.getConfigPath()`` API, proxying ``Core::getConfigPath``
 
 ## Removed
 
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index 0fbcb41971..bdb872049f 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -938,7 +938,17 @@ can be omitted.
 
 * ``dfhack.getHackPath()``
 
-  Returns the dfhack directory path, i.e., ``".../df/hack/"``.
+  Returns the DFHack installation directory path (the folder where DFHack is installed).
+  This may be the ``hack`` folder within the DF installation, but you should not rely on this.
+  Specifically, the installation folder is extremely likely to be somewhere else when DFHack is installed from Steam.
+  Always use this function to get the DFHack installation directory path instead of hardcoding it.
+
+* ``dfhack.getConfigPath()``
+
+  Returns the DFHack config directory path (the folder where user-specific configuration files are stored).
+  This is currently the ``dfhack-config`` folder within the DF installation, but you should not rely on this as it is likely to change in the future.
+  Always use this function to get the DFHack config directory path instead of hardcoding it.
+  Avoid storing this value in a long-lived variable, as it's possible that in future versions of DFHack, it may be possible for the config directory to be changed at runtime.
 
 * ``dfhack.getSavePath()``
 
diff --git a/library/Core.cpp b/library/Core.cpp
index 00419bd7ae..29adbc7ef4 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -135,16 +135,6 @@ namespace DFHack {
     DBG_DECLARE(core, keybinding, DebugCategory::LINFO);
     DBG_DECLARE(core, script, DebugCategory::LINFO);
 
-    static const std::filesystem::path getConfigPath()
-    {
-        return Filesystem::getInstallDir() / "dfhack-config";
-    };
-
-    static const std::filesystem::path getConfigDefaultsPath()
-    {
-        return Core::getInstance().getHackPath() / "data" / "dfhack-config-defaults";
-    };
-
 class MainThread {
 public:
     //! MainThread::suspend keeps the main DF thread suspended from Core::Init to
@@ -538,7 +528,7 @@ std::filesystem::path Core::findScript(std::string name)
     return {};
 }
 
-bool loadScriptPaths(color_ostream &out, bool silent = false)
+bool Core::loadScriptPaths(color_ostream &out, bool silent)
 {
     std::filesystem::path filename{ getConfigPath() / "script-paths.txt" };
     std::ifstream file(filename);
@@ -563,7 +553,7 @@ bool loadScriptPaths(color_ostream &out, bool silent = false)
         getline(ss, path);
         if (ch == '+' || ch == '-')
         {
-            if (!Core::getInstance().addScriptPath(path, ch == '+') && !silent)
+            if (!addScriptPath(path, ch == '+') && !silent)
                 out.printerr("{}:{}: Failed to add path: {}\n", filename, line, path);
         }
         else if (!silent)
@@ -935,12 +925,11 @@ static void run_dfhack_init(color_ostream &out, Core *core)
     }
 
     // load baseline defaults
-    core->loadScriptFile(out, getConfigPath() / "init" / "default.dfhack.init", false);
+    core->loadScriptFile(out, core->getConfigPath() / "init" / "default.dfhack.init", false);
 
     // load user overrides
     std::vector<std::string> prefixes(1, "dfhack");
-    loadScriptFiles(core, out, prefixes, getConfigPath() / "init");
-
+    loadScriptFiles(core, out, prefixes, core->getConfigPath() / "init");
     // show the terminal if requested
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::CallLuaModuleFunction(out, L, "dfhack", "getHideConsoleOnStartup", 0, 1,
@@ -962,9 +951,9 @@ static void fInitthread(IODATA * iod)
 // A thread function... for the interactive console.
 static void fIOthread(IODATA * iod)
 {
-    static const std::filesystem::path HISTORY_FILE = getConfigPath() / "dfhack.history";
-
     Core * core = iod->core;
+    std::filesystem::path HISTORY_FILE = core->getConfigPath() / "dfhack.history";
+
     PluginManager * plug_mgr = iod->plug_mgr;
 
     CommandHistory main_history;
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index d95b6c1a2a..670dddce6c 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1359,6 +1359,7 @@ static uint32_t getTickCount() { return Core::getInstance().p->getTickCount(); }
 
 static std::filesystem::path getDFPath() { return Core::getInstance().p->getPath(); }
 static std::filesystem::path getHackPath() { return Core::getInstance().getHackPath(); }
+static std::filesystem::path getConfigPath() { return Core::getInstance().getConfigPath(); }
 
 static bool isWorldLoaded() { return Core::getInstance().isWorldLoaded(); }
 static bool isMapLoaded() { return Core::getInstance().isMapLoaded(); }
@@ -1384,6 +1385,7 @@ static const LuaWrapper::FunctionReg dfhack_module[] = {
     WRAP(getDFPath),
     WRAP(getTickCount),
     WRAP(getHackPath),
+    WRAP(getConfigPath),
     WRAP(isWorldLoaded),
     WRAP(isMapLoaded),
     WRAP(isSiteLoaded),
diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index 69242ede5f..56c5079838 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -1281,29 +1281,30 @@ bool DFHack::Lua::RunCoreQueryLoop(color_ostream &out, lua_State *state, DFHack:
     return (rv == LUA_OK);
 }
 
-static bool init_interpreter(color_ostream &out, lua_State *state, const char* prompt, const char* hfile)
+static bool init_interpreter(color_ostream &out, lua_State *state, std::string_view prompt, const std::filesystem::path& hfile)
 {
     lua_rawgetp(state, LUA_REGISTRYINDEX, &DFHACK_DFHACK_TOKEN);
     lua_getfield(state, -1, "interpreter");
     lua_remove(state, -2);
-    lua_pushstring(state, prompt);
-    lua_pushstring(state, hfile);
+    lua_pushlstring(state, prompt.data(), prompt.size());
+    lua_pushlstring(state, hfile.string().data(), hfile.string().size());
     return true;
 }
 
 bool DFHack::Lua::InterpreterLoop(color_ostream &out, lua_State *state,
-                                  const char *prompt, const char *hfile)
+                                  std::string_view prompt, std::filesystem::path hfile)
 {
     if (!out.is_console())
         return false;
 
-    if (!hfile)
-        hfile = "dfhack-config/lua.history";
-    if (!prompt)
+    if (hfile.empty())
+        hfile = DFHack::Core::getInstance().getConfigPath() / "lua.history";
+    if (prompt.empty())
         prompt = "lua";
 
-    using namespace std::placeholders;
-    auto init_fn = std::bind(init_interpreter, _1, _2, prompt, hfile);
+    auto init_fn = [&](color_ostream& out, lua_State* state) {
+        return init_interpreter(out, state, prompt, hfile);
+        };
 
     return RunCoreQueryLoop(out, state, init_fn);
 }
diff --git a/library/include/Core.h b/library/include/Core.h
index 8b78e58097..5842b29038 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -29,6 +29,8 @@ distribution.
 #include "Export.h"
 #include "Hooks.h"
 
+#include "modules/Filesystem.h"
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -189,6 +191,8 @@ namespace DFHack
         std::map<std::string, std::vector<std::string>> ListAliases();
         std::string GetAliasCommand(const std::string &name, bool ignore_params = false);
 
+        // note that this isn't valid until after DFHack is initialized by DF calling `dfhooks_init`
+        // that means that it's invalid during at-init static initialization
         std::filesystem::path getHackPath();
 
         bool isWorldLoaded() { return (last_world_data_ptr != nullptr); }
@@ -251,6 +255,18 @@ namespace DFHack
             return false;
         }
 
+        // Note that this path should be treated as potentially changeable over the life of a Core instance
+        // Consumers should not cache this path in long-lived local variables
+        const std::filesystem::path getConfigPath()
+        {
+            return Filesystem::getInstallDir() / "dfhack-config";
+        }
+
+        const std::filesystem::path getConfigDefaultsPath()
+        {
+            return getHackPath() / "data" / "dfhack-config-defaults";
+        }
+
     private:
         DFHack::Console con;
 
@@ -275,6 +291,8 @@ namespace DFHack
         void onStateChange(color_ostream &out, state_change_event event);
         void handleLoadAndUnloadScripts(color_ostream &out, state_change_event event);
 
+        bool loadScriptPaths(color_ostream& out, bool silent = false);
+
         Core(Core const&) = delete;
         void operator=(Core const&) = delete;
 
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 93853468e4..f95095d55b 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -24,15 +24,16 @@ distribution.
 
 #pragma once
 
+#include <concepts>
 #include <functional>
-#include <string>
-#include <vector>
-#include <set>
 #include <map>
+#include <set>
+#include <string>
+#include <string_view>
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
-#include <concepts>
+#include <vector>
 
 #include "Core.h"
 #include "ColorText.h"
@@ -287,7 +288,7 @@ namespace DFHack::Lua {
      * Uses RunCoreQueryLoop internally.
      */
     DFHACK_EXPORT bool InterpreterLoop(color_ostream &out, lua_State *state,
-                                       const char *prompt = NULL, const char *hfile = NULL);
+        std::string_view prompt = {}, std::filesystem::path hfile = {});
 
     /**
      * Run an interactive prompt loop. All access to the lua state
diff --git a/library/lua/script-manager.lua b/library/lua/script-manager.lua
index 80774c53e8..cb4abf1f53 100644
--- a/library/lua/script-manager.lua
+++ b/library/lua/script-manager.lua
@@ -246,7 +246,7 @@ function getModSourcePath(mod_id)
 end
 
 function getModStatePath(mod_id)
-    local path = ('dfhack-config/mods/%s/'):format(mod_id)
+    local path = (dfhack.getConfigPath() + ('/mods/%s/')):format(mod_id)
     if not dfhack.filesystem.mkdir_recursive(path) then
         error(('failed to create mod state directory: "%s"'):format(path))
     end
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index f21198c9d5..3f046bc142 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Console.h"
+#include "Core.h"
 #include "DataDefs.h"
 #include "DataFuncs.h"
 #include "DataIdentity.h"
@@ -59,8 +60,6 @@ using namespace DFHack;
 DFHACK_PLUGIN("blueprint");
 REQUIRE_GLOBAL(world);
 
-static const string BLUEPRINT_USER_DIR = "dfhack-config/blueprints/";
-
 namespace DFHack {
     DBG_DECLARE(blueprint,log);
 }
@@ -1370,9 +1369,9 @@ static const char * get_tile_zone(color_ostream &out, const df::coord &pos, cons
 
 static bool create_output_dir(color_ostream &out,
                               const blueprint_options &opts) {
-    string basename = BLUEPRINT_USER_DIR + opts.name;
-    size_t last_slash = basename.find_last_of("/");
-    string parent_path = basename.substr(0, last_slash);
+    std::filesystem::path BLUEPRINT_USER_DIR = Core::getInstance().getConfigPath() / "blueprints";
+    std::filesystem::path basename = BLUEPRINT_USER_DIR / opts.name;
+    std::filesystem::path parent_path = basename.parent_path();
 
     // create output directory if it doesn't already exist
     if (!Filesystem::mkdir_recursive(parent_path)) {
diff --git a/plugins/debug.cpp b/plugins/debug.cpp
index 51e4a8300b..d0e5e0f5a0 100644
--- a/plugins/debug.cpp
+++ b/plugins/debug.cpp
@@ -21,6 +21,7 @@ redistribute it freely, subject to the following restrictions:
    distribution.
  */
 
+#include "Core.h"
 #include "PluginManager.h"
 #include "DebugManager.h"
 #include "Debug.h"
@@ -352,7 +353,9 @@ struct FilterManager : public std::map<size_t, Filter>
     //! Current configuration version implemented by the code
     constexpr static Json::UInt configVersion{1};
     //! Path to the configuration file
-    constexpr static const char* configPath{"dfhack-config/runtime-debug.json"};
+    const inline std::filesystem::path getConfigPath() const {
+        return DFHack::Core::getInstance().getConfigPath() / "runtime-debug.json";
+    }
 
     //! Get reference to the singleton
     static FilterManager& getInstance() noexcept
@@ -434,8 +437,6 @@ struct FilterManager : public std::map<size_t, Filter>
     DebugManager::categorySignal_t::Connection connection_;
 };
 
-constexpr const char* FilterManager::configPath;
-
 FilterManager::~FilterManager()
 {
 }
@@ -443,6 +444,7 @@ FilterManager::~FilterManager()
 command_result FilterManager::loadConfig(DFHack::color_ostream& out) noexcept
 {
     nextId_ = 1;
+    auto configPath = getConfigPath();
     if (!Filesystem::isfile(configPath))
         return CR_OK;
     try {
@@ -463,6 +465,7 @@ command_result FilterManager::loadConfig(DFHack::color_ostream& out) noexcept
 
 command_result FilterManager::saveConfig(DFHack::color_ostream& out) const noexcept
 {
+    auto configPath = getConfigPath();
     try {
         DEBUG(command, out) << "Save config to '" << configPath << "'" << std::endl;
         JsonArchive archive;
diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index a814bbd5b0..0b5526d996 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -58,7 +58,8 @@ using namespace df::enums;
 DFHACK_PLUGIN("liquids");
 REQUIRE_GLOBAL(world);
 
-static const char * HISTORY_FILE = "dfhack-config/liquids.history";
+auto constexpr HISTORY_FILE = "liquids.history";
+
 CommandHistory liquids_hist;
 
 command_result df_liquids (color_ostream &out, vector <string> & parameters);
@@ -66,7 +67,7 @@ command_result df_liquids_here (color_ostream &out, vector <string> & parameters
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    liquids_hist.load(HISTORY_FILE);
+    liquids_hist.load(DFHack::Core::getInstance().getConfigPath() / HISTORY_FILE);
     commands.push_back(PluginCommand(
         "liquids",
         "Place magma, water or obsidian.",
@@ -82,7 +83,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    liquids_hist.save(HISTORY_FILE);
+    liquids_hist.save(DFHack::Core::getInstance().getConfigPath() / HISTORY_FILE);
     return CR_OK;
 }
 
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 8c765d563f..58e7421c51 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -204,7 +204,7 @@ end
 
 -- returns the name of the output file for the given context
 function get_filename(opts, phase, ordinal)
-    local fullname = 'dfhack-config/blueprints/' .. opts.name
+    local fullname = dfhack.getConfigPath() .. '/blueprints/' .. opts.name
     local _,_,basename = opts.name:find('([^/]+)/*$')
     if not basename then
         -- should not happen since opts.name should already be validated
diff --git a/plugins/lua/buildingplan/planneroverlay.lua b/plugins/lua/buildingplan/planneroverlay.lua
index f0fbe17de4..65a7b1ff35 100644
--- a/plugins/lua/buildingplan/planneroverlay.lua
+++ b/plugins/lua/buildingplan/planneroverlay.lua
@@ -11,7 +11,7 @@ local utils = require('utils')
 local widgets = require('gui.widgets')
 require('dfhack.buildings')
 
-config = config or json.open('dfhack-config/buildingplan.json')
+config = config or json.open(dfhack.getConfigPath() .. '/buildingplan.json')
 
 local uibs = df.global.buildreq
 
diff --git a/plugins/lua/dwarfmonitor.lua b/plugins/lua/dwarfmonitor.lua
index d98bfd80f5..fd18178a51 100644
--- a/plugins/lua/dwarfmonitor.lua
+++ b/plugins/lua/dwarfmonitor.lua
@@ -5,7 +5,7 @@ local guidm = require('gui.dwarfmode')
 local overlay = require('plugins.overlay')
 local utils = require('utils')
 
-local DWARFMONITOR_CONFIG_FILE = 'dfhack-config/dwarfmonitor.json'
+local DWARFMONITOR_CONFIG_FILE = dfhack.getConfigPath() .. '/dwarfmonitor.json'
 
 -- ------------- --
 -- WeatherWidget --
diff --git a/plugins/lua/orders.lua b/plugins/lua/orders.lua
index 80a6196e13..a470e3e2ce 100644
--- a/plugins/lua/orders.lua
+++ b/plugins/lua/orders.lua
@@ -38,7 +38,7 @@ local function do_import()
         dismiss_on_select2=false,
         on_select2=function(_, choice)
             if choice.text:startswith('library/') then return end
-            local fname = 'dfhack-config/orders/'..choice.text..'.json'
+            local fname = dfhack.getConfigPath() .. '/orders/' .. choice.text .. '.json'
             if not dfhack.filesystem.isfile(fname) then return end
             dialogs.showYesNoPrompt('Delete orders file?',
                 'Are you sure you want to delete "' .. fname .. '"?', nil,
diff --git a/plugins/lua/overlay.lua b/plugins/lua/overlay.lua
index c1d1bcb434..cdfaac89e1 100644
--- a/plugins/lua/overlay.lua
+++ b/plugins/lua/overlay.lua
@@ -6,7 +6,7 @@ local scriptmanager = require('script-manager')
 local utils = require('utils')
 local widgets = require('gui.widgets')
 
-local OVERLAY_CONFIG_FILE = 'dfhack-config/overlay.json'
+local OVERLAY_CONFIG_FILE = dfhack.getConfigPath() .. '/overlay.json'
 local OVERLAY_WIDGETS_VAR = 'OVERLAY_WIDGETS'
 local GLOBAL_KEY = 'OVERLAY'
 
diff --git a/plugins/lua/spectate.lua b/plugins/lua/spectate.lua
index 953895eab0..1e0d81f917 100644
--- a/plugins/lua/spectate.lua
+++ b/plugins/lua/spectate.lua
@@ -75,7 +75,7 @@ end
 
 local function load_state()
     local state = get_default_state()
-    local config_file = json.open('dfhack-config/spectate.json')
+    local config_file = json.open(dfhack.getConfigPath() .. '/spectate.json')
     for key in pairs(config_file.data) do
         if state[key] == nil then
             config_file.data[key] = nil
diff --git a/plugins/lua/stockpiles.lua b/plugins/lua/stockpiles.lua
index 33f6e375ad..4b56418861 100644
--- a/plugins/lua/stockpiles.lua
+++ b/plugins/lua/stockpiles.lua
@@ -7,7 +7,7 @@ local logistics = require('plugins.logistics')
 local overlay = require('plugins.overlay')
 local widgets = require('gui.widgets')
 
-local STOCKPILES_DIR = 'dfhack-config/stockpiles'
+local STOCKPILES_DIR = dfhack.getConfigPath() .. '/stockpiles'
 local STOCKPILES_LIBRARY_DIR = dfhack.getHackPath() .. '/data/stockpiles'
 
 local BAD_FILENAME_REGEX = '[^%w._]'
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index 95932acb52..f6a5b6b091 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -44,8 +44,15 @@ DFHACK_PLUGIN("orders");
 
 REQUIRE_GLOBAL(world);
 
-static std::filesystem::path ORDERS_DIR = std::filesystem::path("dfhack-config") / "orders";
-static std::filesystem::path ORDERS_LIBRARY_DIR = Core::getInstance().getHackPath() / "data" / "orders";
+static const std::filesystem::path get_orders_dir()
+{
+    return Core::getInstance().getConfigPath() / "orders";
+}
+
+static std::filesystem::path get_orders_library_dir()
+{
+    return Core::getInstance().getHackPath() / "data" / "orders";
+}
 
 static command_result orders_command(color_ostream & out, std::vector<std::string> & parameters);
 
@@ -135,7 +142,7 @@ static command_result orders_command(color_ostream & out, std::vector<std::strin
 
 static void list_library(color_ostream &out) {
     std::map<std::filesystem::path, bool> files;
-    if (0 < Filesystem::listdir_recursive(ORDERS_LIBRARY_DIR, files, 0, false)) {
+    if (0 < Filesystem::listdir_recursive(get_orders_library_dir(), files, 0, false)) {
         // if the library directory doesn't exist, just skip it
         return;
     }
@@ -163,7 +170,7 @@ static command_result orders_list_command(color_ostream & out)
     // support subdirs so we can identify and ignore subdirs with ".json" names.
     // also listdir_recursive will alphabetize the list for us.
     std::map<std::filesystem::path, bool> files;
-    Filesystem::listdir_recursive(ORDERS_DIR, files, 0, false);
+    Filesystem::listdir_recursive(get_orders_dir(), files, 0, false);
 
     for (auto& it : files) {
         if (it.second)
@@ -504,9 +511,9 @@ static command_result orders_export_command(color_ostream & out, const std::stri
         orders.append(order);
     }
 
-    Filesystem::mkdir(ORDERS_DIR);
+    Filesystem::mkdir(get_orders_dir());
 
-    std::ofstream file(ORDERS_DIR / ( name + ".json"));
+    std::ofstream file(get_orders_dir() / ( name + ".json"));
 
     file << orders << std::endl;
 
@@ -924,7 +931,7 @@ static command_result orders_import_command(color_ostream & out, const std::stri
         return CR_WRONG_USAGE;
     }
 
-    auto filename((is_library ? ORDERS_LIBRARY_DIR : ORDERS_DIR) / (fname + ".json"));
+    auto filename((is_library ? get_orders_library_dir() : get_orders_dir()) / (fname + ".json"));
     Json::Value orders;
 
     {
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 8c8407d189..dc93bea4bb 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -82,7 +82,8 @@ static const std::map<std::pair<df::tiletype_shape, df::tiletype_shape>, df::til
 };
 static const uint16_t UNDERGROUND_TEMP = 10015;
 
-static const char * HISTORY_FILE = "dfhack-config/tiletypes.history";
+static const std::filesystem::path get_history_file() { return Core::getInstance().getConfigPath() / "tiletypes.history"; }
+
 CommandHistory tiletypes_hist;
 
 command_result df_tiletypes (color_ostream &out, vector <string> & parameters);
@@ -92,7 +93,7 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    tiletypes_hist.load(HISTORY_FILE);
+    tiletypes_hist.load(get_history_file());
     commands.push_back(PluginCommand("tiletypes", "Paints tiles of specified types onto the map.", df_tiletypes, true, true));
     commands.push_back(PluginCommand("tiletypes-command", "Run tiletypes commands (seperated by ' ; ')", df_tiletypes_command));
     commands.push_back(PluginCommand("tiletypes-here", "Repeat tiletypes command at cursor (with brush)", df_tiletypes_here));
@@ -102,7 +103,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    tiletypes_hist.save(HISTORY_FILE);
+    tiletypes_hist.save(get_history_file());
     return CR_OK;
 }
 
diff --git a/test/plugins/blueprint.lua b/test/plugins/blueprint.lua
index a08844bbee..d5ebd2031d 100644
--- a/test/plugins/blueprint.lua
+++ b/test/plugins/blueprint.lua
@@ -243,16 +243,16 @@ end
 
 function test.get_filename()
     local opts = {name='a', split_strategy='none'}
-    expect.eq('dfhack-config/blueprints/a.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq(dfhack.getConfigPath() .. '/blueprints/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='none'}
-    expect.eq('dfhack-config/blueprints/a/a.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq(dfhack.getConfigPath() .. '/blueprints/a/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a', split_strategy='phase'}
-    expect.eq('dfhack-config/blueprints/a-1-dig.csv', b.get_filename(opts, 'dig', 1))
+    expect.eq(dfhack.getConfigPath() .. '/blueprints/a-1-dig.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='phase'}
-    expect.eq('dfhack-config/blueprints/a/a-5-dig.csv', b.get_filename(opts, 'dig', 5))
+    expect.eq(dfhack.getConfigPath() .. '/blueprints/a/a-5-dig.csv', b.get_filename(opts, 'dig', 5))
 
     expect.error_match('could not parse basename', function()
             b.get_filename({name='', split_strategy='none'})
diff --git a/test/plugins/orders.lua b/test/plugins/orders.lua
index ab2ad3235e..86d03101dd 100644
--- a/test/plugins/orders.lua
+++ b/test/plugins/orders.lua
@@ -1,7 +1,7 @@
 config.mode = 'fortress'
 config.target = 'orders'
 
-local FILE_PATH_PATTERN = 'dfhack-config/orders/%s.json'
+local FILE_PATH_PATTERN = dfhack.getConfigPath() .. '/orders/%s.json'
 
 local BACKUP_FILE_NAME = 'tmp-backup'
 local BACKUP_FILE_PATH = FILE_PATH_PATTERN:format(BACKUP_FILE_NAME)