diff --git a/ci_scripts/configure-global-tde.sh b/ci_scripts/configure-global-tde.sh
index 7ce012f7c7c..09c64082bcf 100644
--- a/ci_scripts/configure-global-tde.sh
+++ b/ci_scripts/configure-global-tde.sh
@@ -7,6 +7,7 @@ source $SCRIPT_DIR/env.sh
 
 cd "$SCRIPT_DIR/.."
 
+source "$SCRIPT_DIR/env.sh"
 export PATH=$INSTALL_DIR/bin:$PATH
 export DATA_DIR=$INSTALL_DIR/data
 export PGDATA="${1:-$DATA_DIR}"
diff --git a/ci_scripts/make-build.sh b/ci_scripts/make-build.sh
index 799fd2364a2..c99e77a051b 100755
--- a/ci_scripts/make-build.sh
+++ b/ci_scripts/make-build.sh
@@ -13,7 +13,7 @@ done
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 INSTALL_DIR="$SCRIPT_DIR/../../pginst"
-source $SCRIPT_DIR/env.sh
+source "$SCRIPT_DIR/env.sh"
 
 cd "$SCRIPT_DIR/.."
 
@@ -22,5 +22,5 @@ if [ "$1" = "debugoptimized" ]; then
     export CXXFLAGS="-O2"
 fi
 
-./configure --enable-debug --enable-cassert --enable-tap-tests --prefix=$INSTALL_DIR $ENABLE_COVERAGE
+./configure --prefix="$INSTALL_DIR" --enable-debug --enable-cassert --enable-tap-tests $ENABLE_COVERAGE
 make install-world -j
diff --git a/ci_scripts/make-test-global-tde.sh b/ci_scripts/make-test-global-tde.sh
index 4c8e72c0fa6..ee4a8787fbf 100755
--- a/ci_scripts/make-test-global-tde.sh
+++ b/ci_scripts/make-test-global-tde.sh
@@ -13,7 +13,6 @@ do
 done
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
-source $SCRIPT_DIR/env.sh
-source $SCRIPT_DIR/configure-global-tde.sh
+source "$SCRIPT_DIR/configure-global-tde.sh"
 
 EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql" make -s installcheck-world $ADD_FLAGS
diff --git a/ci_scripts/make-test.sh b/ci_scripts/make-test.sh
index ea6377496f3..6ce136dd28b 100755
--- a/ci_scripts/make-test.sh
+++ b/ci_scripts/make-test.sh
@@ -12,9 +12,8 @@ do
     esac
 done
 
-SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)"
-INSTALL_DIR="$SCRIPT_DIR/../../pginst"
-source $SCRIPT_DIR/env.sh
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
+source "$SCRIPT_DIR/env.sh"
 
 if [ "$TDE_ONLY" -eq 1 ];
 then
diff --git a/ci_scripts/meson-build.sh b/ci_scripts/meson-build.sh
index c94b12421ab..e954b04619c 100755
--- a/ci_scripts/meson-build.sh
+++ b/ci_scripts/meson-build.sh
@@ -1,8 +1,21 @@
 #!/bin/bash
 
+ENABLE_COVERAGE=
+
+for arg in "$@"
+do
+    case "$arg" in
+        --enable-coverage)
+            ENABLE_COVERAGE="-Db_coverage=true"
+            shift;;
+    esac
+done
+
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
+INSTALL_DIR="$SCRIPT_DIR/../../pginst"
+source "$SCRIPT_DIR/env.sh"
 
 cd "$SCRIPT_DIR/.."
 
-meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled
+meson setup build --prefix "$INSTALL_DIR" --buildtype="$1" -Dcassert=true -Dtap_tests=enabled $ENABLE_COVERAGE
 cd build && ninja && ninja install
diff --git a/ci_scripts/meson-test-tde.sh b/ci_scripts/meson-test-global-tde.sh
similarity index 100%
rename from ci_scripts/meson-test-tde.sh
rename to ci_scripts/meson-test-global-tde.sh
diff --git a/ci_scripts/meson-test.sh b/ci_scripts/meson-test.sh
index 5d0ad07e4ce..f3f888d31c2 100755
--- a/ci_scripts/meson-test.sh
+++ b/ci_scripts/meson-test.sh
@@ -1,7 +1,25 @@
 #!/bin/bash
 
+set -e
+TDE_ONLY=0
+
+for arg in "$@"
+do
+    case "$arg" in
+        --tde-only)
+            TDE_ONLY=1
+            shift;;
+    esac
+done
+
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
+source "$SCRIPT_DIR/env.sh"
 
 cd "$SCRIPT_DIR/../build"
 
-meson test
+if [ "$TDE_ONLY" -eq 1 ];
+then
+    meson test --suite setup --suite pg_tde
+else
+    meson test
+fi