diff --git a/support/travis-build.py b/support/travis-build.py
index 6a8f9d0f..0cf73c84 100755
--- a/support/travis-build.py
+++ b/support/travis-build.py
@@ -91,11 +91,12 @@ cmake_flags = [
 ]
 
 # Make sure the fuzzers still compile.
+main_cmake_flags = list(cmake_flags)
 if 'ENABLE_FUZZING' in os.environ:
-    cmake_flags += ['-DFMT_FUZZ=ON', '-DFMT_FUZZ_LINKMAIN=On']
+    main_cmake_flags += ['-DFMT_FUZZ=ON', '-DFMT_FUZZ_LINKMAIN=On']
 
 check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', '-DFMT_WERROR=ON', fmt_dir] +
-           cmake_flags, cwd=build_dir)
+           main_cmake_flags, cwd=build_dir)
 
 # Build the library.
 check_call(['cmake', '--build','.'], cwd=build_dir)
diff --git a/test/scan.h b/test/scan.h
index c0789a30..da40240a 100644
--- a/test/scan.h
+++ b/test/scan.h
@@ -215,7 +215,7 @@ struct scan_handler : error_handler {
 
 template <typename... Args>
 std::array<internal::scan_arg, sizeof...(Args)> make_scan_args(Args&... args) {
-  return std::array<internal::scan_arg, sizeof...(Args)>{args...};
+  return {{args...}};
 }
 
 string_view::iterator vscan(string_view input, string_view format_str,
diff --git a/test/std-format-test.cc b/test/std-format-test.cc
index 5d7576b0..2fd60d41 100644
--- a/test/std-format-test.cc
+++ b/test/std-format-test.cc
@@ -123,7 +123,8 @@ template <> struct std::formatter<S> {
   auto format(S s, format_context& ctx) {
     int width = visit_format_arg(
         [](auto value) -> int {
-          if constexpr (!is_integral_v<decltype(value)>)
+          using type = decltype(value);
+          if constexpr (!is_integral_v<type> || is_same_v<type, bool>)
             throw format_error("width is not integral");
           // else if (value < 0 || value > numeric_limits<int>::max())
           else if (fmt::internal::is_negative(value) ||