diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e98eb6a3a..13f3b09c3 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,24 +1,28 @@
-add_subdirectory(source-control-tools)
+option(BUILD_SOURCE_CONTROL_TOOLS "Build the source control tools" OFF)
+if(BUILD_SOURCE_CONTROL_TOOLS)
+	add_subdirectory(source-control-tools)
+endif()
+
 add_subdirectory(devtools)
 
 include(PackageHelper)
 exclude_from_source_package(
 	# Subdirectories
 	"debian/"
 	"gitian/"
 	"gitian-descriptors/"
 	"gitian-signing/"
 	"qos/"
 	"seeds/"
 	"teamcity/"
 	"testgen/"
 	# FIXME Can be packaged once it gets updated to work with Bitcoin ABC
 	"verifybinaries/"
 	"zmq/"
 
 	# Files
 	"bitcoin-qt.pro"
 	"gitian-build.py"
 	"README.md"
 	"valgrind.supp"
 )
diff --git a/contrib/source-control-tools/CMakeLists.txt b/contrib/source-control-tools/CMakeLists.txt
index ecf7fb4fa..2c8d43733 100644
--- a/contrib/source-control-tools/CMakeLists.txt
+++ b/contrib/source-control-tools/CMakeLists.txt
@@ -1,21 +1,22 @@
 # Copyright (c) 2019 The Bitcoin developers
 
 add_custom_target(check-source-control-tools)
 
-find_program(BASH_EXECUTABLE bash)
+include(DoOrFail)
+find_program_or_fail(BASH_EXECUTABLE bash)
 
 set(SOURCE_CONTROL_TOOLS_TESTS
-  ./test/test-autopatch.sh
+  test/test-autopatch.sh
 )
 
 foreach(TEST ${SOURCE_CONTROL_TOOLS_TESTS})
   get_filename_component(FILENAME ${TEST} NAME)
   set(TESTNAME "check-source-control-tools-${FILENAME}")
   add_custom_target(${TESTNAME}
     COMMAND
       "${BASH_EXECUTABLE}"
       "${CMAKE_CURRENT_SOURCE_DIR}/${TEST}"
     )
   add_dependencies(check-source-control-tools ${TESTNAME})
 endforeach()