diff --git a/tools/build-and-test.sh b/tools/build-and-test.sh
index 81fae3f1..123ed39f 100755
--- a/tools/build-and-test.sh
+++ b/tools/build-and-test.sh
@@ -112,7 +112,7 @@ function build_bjam ()
       toolset=$TOOLSET \
       variant=$VARIANT \
       -j${JOBS}
-  else
+  elif [[ $VARIANT == "debug" ]]; then
     b2 \
       define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
       cxxstd=$CXXSTD \
@@ -121,6 +121,14 @@ function build_bjam ()
       toolset=$TOOLSET \
       variant=$VARIANT \
       -j${JOBS}
+  else
+    b2 \
+      define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
+      cxxstd=$CXXSTD \
+      libs/beast/test//fat-tests \
+      toolset=$TOOLSET \
+      variant=$VARIANT \
+      -j${JOBS}
   fi
 }