diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 5dcc4c9..372ccca 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -947,7 +947,7 @@
         isoduration \
         isort \
         jsonschema \
-        meson==1.5.1 \
+        meson==1.6.1 \
         requests
 
 RUN npm install -g \
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 448c0da..e5ee8e2 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -26,8 +26,8 @@
 # that would be broken if we didn't include it.
 from mesonbuild import interpreter  # noqa: F401
 from mesonbuild import optinterpreter, options
-from mesonbuild.mesonlib import OptionKey
 from mesonbuild.mesonlib import version_compare as meson_version_compare
+from mesonbuild.options import OptionKey, OptionStore
 
 
 class DepTree:
@@ -854,7 +854,8 @@
         Parameters:
         options_file        The file containing options
         """
-        oi = optinterpreter.OptionInterpreter("")
+        store = OptionStore()
+        oi = optinterpreter.OptionInterpreter(store, "")
         oi.process(options_file)
         return oi.options