diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 7a1466b8687f6b..64a5d31616153e 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -55,4 +55,8 @@ then
 fi
 check_unignored_build_artifacts
 
+case " $MAKE_TARGETS " in
+*" all "*) make -C contrib/subtree test;;
+esac
+
 save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index ae8094382fe418..6bf19ab15b28d3 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -20,4 +20,7 @@ if [ "$1" == "0" ] ; then
 	group "Run unit tests" make --quiet -C t unit-tests-prove
 fi
 
+# Run the git subtree tests only if main tests succeeded
+test 0 != "$1" || make -C contrib/subtree test
+
 check_unignored_build_artifacts