diff --git a/test_runner/fixtures/log_helper.py b/test_runner/fixtures/log_helper.py
index 17f2402391..7d112fce89 100644
--- a/test_runner/fixtures/log_helper.py
+++ b/test_runner/fixtures/log_helper.py
@@ -1,5 +1,6 @@
 import logging
 import logging.config
+import re
 
 """
 This file configures logging to use in python tests.
@@ -29,6 +30,17 @@ LOGGING = {
 }
 
 
+class PasswordFilter(logging.Filter):
+    """Filter out password from logs."""
+
+    # Good enough to filter our passwords produced by PgProtocol.connstr
+    FILTER = re.compile(r"(\s*)password=[^\s]+(\s*)")
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        record.msg = self.FILTER.sub(r"\1password=<hidden>\2", str(record.msg))
+        return True
+
+
 def getLogger(name="root") -> logging.Logger:
     """Method to get logger for tests.
 
@@ -38,5 +50,6 @@ def getLogger(name="root") -> logging.Logger:
 
 # default logger for tests
 log = getLogger()
+log.addFilter(PasswordFilter())
 
 logging.config.dictConfig(LOGGING)
diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index b47e560325..69c6d31315 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -125,7 +125,8 @@ def pytest_configure(config):
     if env_neon_bin:
         neon_binpath = env_neon_bin
     else:
-        neon_binpath = os.path.join(base_dir, "target/debug")
+        build_type = os.environ.get("BUILD_TYPE", "debug")
+        neon_binpath = os.path.join(base_dir, "target", build_type)
     log.info(f"neon_binpath is {neon_binpath}")
     if not os.path.exists(os.path.join(neon_binpath, "pageserver")):
         raise Exception('neon binaries not found at "{}"'.format(neon_binpath))