diff --git a/scripts/run_pgembed_fixture.py b/scripts/run_pgembed_fixture.py
index e79b5bdc3..2c5c24f0d 100644
--- a/scripts/run_pgembed_fixture.py
+++ b/scripts/run_pgembed_fixture.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import argparse
 import os
 import platform
diff --git a/tools/shell/test/test_helper.py b/tools/shell/test/test_helper.py
index a6d574309..0a882a1fa 100644
--- a/tools/shell/test/test_helper.py
+++ b/tools/shell/test/test_helper.py
@@ -11,7 +11,7 @@
 LBUG_EXEC_PATH = os.path.join(
     LBUG_ROOT,
     "build",
-    "relwithdebinfo",
+    os.environ.get("LBUG_BUILD_TYPE", "relwithdebinfo"),
     "tools",
     "shell",
     "lbug",