diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh
index 00ae7aff5..f4f6b74cf 100755
--- a/build/bootstrap_mcs.sh
+++ b/build/bootstrap_mcs.sh
@@ -157,10 +157,17 @@ build()
                      -DBUILD_CONFIG=mysql_release
                      -DWITH_WSREP=OFF
                      -DWITH_SSL=system
-                     -DWITH_UNITTESTS=YES
-                     -DWITH_BRM_UT=YES
                      -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX"
 
+
+    if [[ $SKIP_UNIT_TESTS = true ]] ; then
+        warn "Unittests are not build"
+        MDB_CMAKE_FLAGS="${MDB_CMAKE_FLAGS} -DWITH_UNITTESTS=NO -DWITH_BRM_UT=NO"
+    else
+        MDB_CMAKE_FLAGS="${MDB_CMAKE_FLAGS} -DWITH_UNITTESTS=YES -DWITH_BRM_UT=YES"
+        message "Buiding with unittests"
+    fi
+
     cd $MDB_SOURCE_PATH
 
     if [[ $SKIP_SUBMODULES = true ]] ; then