diff --git a/contrib/teamcity/build.sh b/contrib/teamcity/build.sh
--- a/contrib/teamcity/build.sh
+++ b/contrib/teamcity/build.sh
@@ -30,6 +30,14 @@
 	CONFIGURE_FLAGS+=("--disable-wallet")
 fi
 
+# Default to nothing
+: ${ENABLE_DEBUG:=}
+
+if [[ ! -z "${ENABLE_DEBUG}" ]]; then
+	echo "*** Building with debug"
+	CONFIGURE_FLAGS+=("--enable-debug")
+fi
+
 ../configure "${CONFIGURE_FLAGS[@]}"
 
 # Run build
@@ -45,16 +53,21 @@
 	# Run unit tests
 	make -j ${THREADS} check
 
-	mkdir -p output/
-	BRANCH=$(git rev-parse --abbrev-ref HEAD)
-	if [[ ! -z "${DISABLE_WALLET}" ]]; then
-		echo "Skipping rpc testing due to disabled wallet functionality."
-	elif [[ "${BRANCH}" == "master" ]]; then
-		./test/functional/test_runner.py --cutoff=600 --tmpdirprefix=output
-		./test/functional/test_runner.py --cutoff=600 --tmpdirprefix=output --with-greatwallactivation
+	# FIXME Remove when the functional tests are running with debug enabled
+	if [[ -z "${ENABLE_DEBUG}" ]]; then
+		mkdir -p output/
+		BRANCH=$(git rev-parse --abbrev-ref HEAD)
+		if [[ ! -z "${DISABLE_WALLET}" ]]; then
+			echo "Skipping rpc testing due to disabled wallet functionality."
+		elif [[ "${BRANCH}" == "master" ]]; then
+			./test/functional/test_runner.py --cutoff=600 --tmpdirprefix=output
+			./test/functional/test_runner.py --cutoff=600 --tmpdirprefix=output --with-greatwallactivation
+		else
+			./test/functional/test_runner.py --tmpdirprefix=output
+			./test/functional/test_runner.py --tmpdirprefix=output --with-greatwallactivation
+		fi
 	else
-		./test/functional/test_runner.py --tmpdirprefix=output
-		./test/functional/test_runner.py --tmpdirprefix=output --with-greatwallactivation
+		echo "*** Functional tests have been skipped"
 	fi
 else
 	echo "*** Tests have been skipped"