diff --git a/BUILD/build_deb_local.sh b/BUILD/build_deb_local.sh
index 2a3cc8352..13b8bab1d 100755
--- a/BUILD/build_deb_local.sh
+++ b/BUILD/build_deb_local.sh
@@ -14,6 +14,12 @@ cmake ..  $cmake_flags
 export LD_LIBRARY_PATH=$PWD/log_manager:$PWD/query_classifier
 make
 
+if [[ "$cmake_flags" =~ "BUILD_TESTS" ]]
+then
+    # All tests must pass otherwise the build is considered a failure
+    make test || exit 1
+fi
+
 export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
 make package
 res=$?
diff --git a/BUILD/build_rpm_local.sh b/BUILD/build_rpm_local.sh
index ae78b6698..ab28f06e0 100755
--- a/BUILD/build_rpm_local.sh
+++ b/BUILD/build_rpm_local.sh
@@ -12,6 +12,12 @@ cd _build
 cmake ..  $cmake_flags
 make
 
+if [[ "$cmake_flags" =~ "BUILD_TESTS" ]]
+then
+    # All tests must pass otherwise the build is considered a failure
+    make test || exit 1
+fi
+
 if [ $remove_strip == "yes" ] ; then
 	sudo rm -rf /usr/bin/strip
 	sudo touch /usr/bin/strip