diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 28cfe730ee..9bdfac128d 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -63,5 +63,9 @@ case "$jobname" in
 	;;
 esac
 
+case " $MAKE_TARGETS " in
+*" all "*) make -C contrib/subtree test;;
+esac
+
 check_unignored_build_artifacts
 save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index ff948e397f..f84190e7b7 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -15,4 +15,7 @@ if [ "$1" == "0" ] ; then
 	group "Run unit tests" make --quiet -C t unit-tests-test-tool
 fi
 
+# Run the git subtree tests only if main tests succeeded
+test 0 != "$1" || make -C contrib/subtree test
+
 check_unignored_build_artifacts
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index c0c9f21cb7..dab2dfc08e 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -95,7 +95,7 @@ $(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
 	cp $< $@
 
 test: $(GIT_SUBTREE_TEST)
-	$(MAKE) -C t/ test
+	$(MAKE) -C t/ all
 
 clean:
 	$(RM) $(GIT_SUBTREE)