diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 0565f158..414a2b3e 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -257,6 +257,8 @@ class CIBuilder(Test):
                 f.write('SSTATE_DIR = "%s"\n' % sstate_dir)
             if sstate and 'SSTATE_MIRRORS' in os.environ:
                 f.write('SSTATE_MIRRORS = "%s"\n' % os.environ['SSTATE_MIRRORS'])
+            if 'BB_HASHSERVE_DB_DIR' in os.environ:
+                f.write('BB_HASHSERVE_DB_DIR = "%s"\n' % os.environ['BB_HASHSERVE_DB_DIR'])
             if image_install is not None:
                 f.write('IMAGE_INSTALL = "%s"\n' % image_install)
             else:
diff --git a/testsuite/dockerdata/test-container-entrypoint b/testsuite/dockerdata/test-container-entrypoint
index aa3def79..d263760d 100755
--- a/testsuite/dockerdata/test-container-entrypoint
+++ b/testsuite/dockerdata/test-container-entrypoint
@@ -124,6 +124,6 @@ if [ "${start_shell}" = 1 ]; then
 	bash
 else
 	set -x
-	avocado ${showopt} run ${args}
+	exec avocado ${showopt} run ${args}
 fi
 '