diff --git a/.travis.yml b/.travis.yml
index 4388dd57..f306cd62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 language: cpp
 dist: trusty
-sudo: required # the doc target uses sudo to install dependencies
+sudo: false
+
+os: linux
+
+git:
+  depth: 1
 
-os:
-  - linux
-  - osx
 
 env:
   global:
@@ -12,18 +14,81 @@ env:
         a1eovNn4uol9won7ghr67eD3/59oeESN+G9bWE+ecI1V6yRseG9whniGhIpC/YfMW/Qz5I
         5sxSmFjaw9bxCISNwUIrL1O5x2AmRYTnFcXk4dFsUvlZg+WeF/aKyBYCNRM8C2ndbBmtAO
         o1F2EwFbiso0EmtzhAPs19ujiVxkLn4=
-  matrix:
-    - BUILD=Doc
-    - BUILD=Debug STANDARD=14
-    - BUILD=Release STANDARD=14
 
 matrix:
-  exclude:
-    - os: osx
-      env: BUILD=Doc
   include:
+      # Documentation
+    - env: BUILD=Doc
+      sudo: required
+      # g++ 6 on Linux with C++14
+    - env: COMPILER=g++-6 BUILD=Debug STANDARD=14
+      compiler: gcc
+      addons:
+        apt:
+          update: true
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+    - env: COMPILER=g++-6 BUILD=Release STANDARD=14
+      compiler: gcc
+      addons:
+        apt:
+          update: true
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      # Apple clang on OS X with C++14
+    - env: BUILD=Debug STANDARD=14
+      compiler: clang
+      os: osx
+    - env: BUILD=Release STANDARD=14
+      compiler: clang
+      os: osx
+      # clang 6.0 on Linux with C++14
+    - env: COMPILER=clang++-6.0 BUILD=Debug STANDARD=14
+      compiler: clang
+      addons:
+        apt:
+          update: true
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty
+            - llvm-toolchain-trusty-6.0
+      # clang 4.0 on Linux with C++14
+    - env: COMPILER=clang++-4.0 BUILD=Debug STANDARD=11
+      compiler: clang
+      addons:
+        apt:
+          update: true
+          packages:
+            - clang-4.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty
+            - llvm-toolchain-trusty-4.0
+      # g++ 4.8 on Linux with C++11
+    - env: COMPILER=g++-4.8 BUILD=Debug STANDARD=11
+      compiler: gcc
+      # g++ 4.4 on Linux with C++11
+    - env: COMPILER=g++-4.4 BUILD=Debug STANDARD=11
+      compiler: gcc
+      addons:
+        apt:
+          update: true
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+      # Android
     - language: android
       android:
+      addons:
+        apt:
+          update: true
       components:
         - tools
         - platform-tools
@@ -51,17 +116,14 @@ matrix:
       after_success:
         - cd ${TRAVIS_BUILD_DIR}
         - tree ./libs
+  allow_failures:
+      # Errors
+    - env: COMPILER=g++-4.4 BUILD=Debug STANDARD=11
+      compiler: gcc
 
-# Install gcc-6 for extended constexpr support.
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-6
-
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-6; fi
+before_script:
+  - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then export CXX=${COMPILER}; fi
+  - if [[ "${BUILD}" != "Doc" ]]; then ${CXX} --version; fi
 
 script:
   - support/travis-build.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0626131..0dc4e469 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1.0)
 
 # Determine if fmt is built as a subproject (using add_subdirectory)
 # or if it is the master project.
@@ -28,12 +28,12 @@ if (NOT CMAKE_BUILD_TYPE)
 endif ()
 
 option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
+option(FMT_WERROR "Halt the compilation with an error on compiler warnings." OFF)
 
 # Options that control generation of various targets.
 option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT})
 option(FMT_INSTALL "Generate the install target." ${MASTER_PROJECT})
 option(FMT_TEST "Generate the test target." ${MASTER_PROJECT})
-option(FMT_USE_CPP14 "Enable the addition of C++14 compiler flags." ON)
 
 project(FMT)
 
@@ -58,9 +58,62 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/support/cmake")
 
 include(cxx14)
+include(CheckCXXCompilerFlag)
 
-if (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-  set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wshadow -pedantic)
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  set(PEDANTIC_COMPILE_FLAGS -pedantic-errors -Wall -Wextra -pedantic
+      -Wold-style-cast -Wfloat-equal -Wlogical-op -Wundef
+      -Wredundant-decls -Wshadow -Wwrite-strings -Wpointer-arith
+      -Wcast-qual -Wformat=2 -Wmissing-include-dirs
+      -Wcast-align -Wnon-virtual-dtor
+      -Wctor-dtor-privacy -Wdisabled-optimization
+      -Winvalid-pch -Wmissing-declarations -Woverloaded-virtual
+      -Wno-sign-conversion -Wno-shadow -Wno-format-nonliteral
+      -Wno-dangling-else -Wno-ctor-dtor-privacy)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+      set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wnoexcept)
+  endif ()
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+      set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wdouble-promotion
+          -Wtrampolines -Wzero-as-null-pointer-constant -Wuseless-cast
+          -Wvector-operation-performance -Wsized-deallocation)
+  endif ()
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+      set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wshift-overflow=2
+          -Wnull-dereference -Wduplicated-cond)
+  endif ()
+
+  set(WERROR_FLAG -Werror)
+endif ()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set(PEDANTIC_COMPILE_FLAGS -Weverything -Wpedantic
+      -Wno-weak-vtables -Wno-padded -Wno-gnu-statement-expression
+      -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-reserved-id-macro
+      -Wno-global-constructors -Wno-disabled-macro-expansion
+      -Wno-switch-enum -Wno-documentation-unknown-command
+      -Wno-gnu-string-literal-operator-template -Wno-unused-member-function
+      -Wno-format-nonliteral -Wno-missing-noreturn -Wno-undefined-func-template
+      -Wno-shadow -Wno-sign-conversion -Wno-used-but-marked-unused
+      -Wno-covered-switch-default -Wno-missing-variable-declarations
+      -Wno-double-promotion)
+
+  set(WERROR_FLAG -Werror)
+
+  check_cxx_compiler_flag(-Wno-zero-as-null-pointer-constant HAS_NULLPTR_WARNING)
+  if (HAS_NULLPTR_WARNING)
+    set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-zero-as-null-pointer-constant)
+  endif ()
+
+  check_cxx_compiler_flag(-Wno-gnu-string-literal-operator-template HAS_GNU_UDL_WARNING)
+  if (HAS_GNU_UDL_WARNING)
+    set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-gnu-string-literal-operator-template)
+  endif ()
+endif ()
+
+if (MSVC)
+  set(PEDANTIC_COMPILE_FLAGS /W4)
+  set(WERROR_FLAG /WX)
 endif ()
 
 if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
@@ -106,9 +159,9 @@ endif ()
 add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS} README.rst ChangeLog.rst)
 add_library(fmt::fmt ALIAS fmt)
 
-# Starting with CMake 3.1 the CXX_STANDARD property can be used instead.
-# Don't export -std since it may break projects that use other standards.
-target_compile_options(fmt PRIVATE ${CPP14_FLAG})
+if (FMT_WERROR)
+  target_compile_options(fmt PRIVATE ${WERROR_FLAG})
+endif ()
 if (FMT_PEDANTIC)
   target_compile_options(fmt PRIVATE ${PEDANTIC_COMPILE_FLAGS})
 endif ()
@@ -130,17 +183,14 @@ if (BUILD_SHARED_LIBS)
   target_compile_definitions(fmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED)
 endif ()
 
-# Additionally define a header-only library when CMake is new enough.
-if (CMAKE_VERSION VERSION_GREATER 3.1.0 OR CMAKE_VERSION VERSION_EQUAL 3.1.0)
-  add_library(fmt-header-only INTERFACE)
-  add_library(fmt::fmt-header-only ALIAS fmt-header-only)
+add_library(fmt-header-only INTERFACE)
+add_library(fmt::fmt-header-only ALIAS fmt-header-only)
 
-  target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
+target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
 
-  target_include_directories(fmt-header-only INTERFACE
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>)
-endif ()
+target_include_directories(fmt-header-only INTERFACE
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>)
 
 # Install targets.
 if (FMT_INSTALL)
diff --git a/include/fmt/core.h b/include/fmt/core.h
index c221475c..3cd6b4c0 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -30,6 +30,12 @@
 # define FMT_HAS_INCLUDE(x) 0
 #endif
 
+#ifdef __has_cpp_attribute
+# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+# define FMT_HAS_CPP_ATTRIBUTE(x) 0
+#endif
+
 #if defined(__GNUC__) && !defined(__clang__)
 # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
 #else
@@ -95,6 +101,12 @@
 # define FMT_USE_NULLPTR 0
 #endif
 
+#if FMT_HAS_CPP_ATTRIBUTE(noreturn)
+# define FMT_NORETURN [[noreturn]]
+#else
+# define FMT_NORETURN /*noreturn*/
+#endif
+
 // Check if exceptions are disabled.
 #if defined(__GNUC__) && !defined(__EXCEPTIONS)
 # define FMT_EXCEPTIONS 0
@@ -218,7 +230,7 @@ class basic_string_view {
 #else
   struct type {
     const char *data() const { return FMT_NULL; }
-    size_t size() const { return 0; };
+    size_t size() const { return 0; }
   };
 #endif
 
@@ -550,11 +562,17 @@ FMT_CONSTEXPR basic_format_arg<Context> make_arg(const T &value);
     return static_cast<ValueType>(val); \
   }
 
+#define FMT_MAKE_VALUE_SAME(TAG, Type) \
+  template <typename C> \
+  FMT_CONSTEXPR typed_value<C, TAG> make_value(Type val) { \
+    return val; \
+  }
+
 FMT_MAKE_VALUE(bool_type, bool, int)
 FMT_MAKE_VALUE(int_type, short, int)
 FMT_MAKE_VALUE(uint_type, unsigned short, unsigned)
-FMT_MAKE_VALUE(int_type, int, int)
-FMT_MAKE_VALUE(uint_type, unsigned, unsigned)
+FMT_MAKE_VALUE_SAME(int_type, int)
+FMT_MAKE_VALUE_SAME(uint_type, unsigned)
 
 // To minimize the number of types we need to deal with, long is translated
 // either to int or to long long depending on its size.
@@ -568,8 +586,8 @@ FMT_MAKE_VALUE(
     (sizeof(unsigned long) == sizeof(unsigned) ? uint_type : ulong_long_type),
     unsigned long, ulong_type)
 
-FMT_MAKE_VALUE(long_long_type, long long, long long)
-FMT_MAKE_VALUE(ulong_long_type, unsigned long long, unsigned long long)
+FMT_MAKE_VALUE_SAME(long_long_type, long long)
+FMT_MAKE_VALUE_SAME(ulong_long_type, unsigned long long)
 FMT_MAKE_VALUE(int_type, signed char, int)
 FMT_MAKE_VALUE(uint_type, unsigned char, unsigned)
 FMT_MAKE_VALUE(char_type, char, int)
@@ -583,8 +601,8 @@ inline typed_value<C, char_type> make_value(wchar_t val) {
 #endif
 
 FMT_MAKE_VALUE(double_type, float, double)
-FMT_MAKE_VALUE(double_type, double, double)
-FMT_MAKE_VALUE(long_double_type, long double, long double)
+FMT_MAKE_VALUE_SAME(double_type, double)
+FMT_MAKE_VALUE_SAME(long_double_type, long double)
 
 // Formatting of wide strings into a narrow buffer and multibyte strings
 // into a wide buffer is disallowed (https://github.com/fmtlib/fmt/pull/606).
@@ -594,18 +612,17 @@ FMT_MAKE_VALUE(cstring_type, const typename C::char_type*,
                const typename C::char_type*)
 
 FMT_MAKE_VALUE(cstring_type, signed char*, const signed char*)
-FMT_MAKE_VALUE(cstring_type, const signed char*, const signed char*)
+FMT_MAKE_VALUE_SAME(cstring_type, const signed char*)
 FMT_MAKE_VALUE(cstring_type, unsigned char*, const unsigned char*)
-FMT_MAKE_VALUE(cstring_type, const unsigned char*, const unsigned char*)
-FMT_MAKE_VALUE(string_type, basic_string_view<typename C::char_type>,
-               basic_string_view<typename C::char_type>)
+FMT_MAKE_VALUE_SAME(cstring_type, const unsigned char*)
+FMT_MAKE_VALUE_SAME(string_type, basic_string_view<typename C::char_type>)
 FMT_MAKE_VALUE(string_type,
                typename basic_string_view<typename C::char_type>::type,
                basic_string_view<typename C::char_type>)
 FMT_MAKE_VALUE(string_type, const std::basic_string<typename C::char_type>&,
                basic_string_view<typename C::char_type>)
 FMT_MAKE_VALUE(pointer_type, void*, const void*)
-FMT_MAKE_VALUE(pointer_type, const void*, const void*)
+FMT_MAKE_VALUE_SAME(pointer_type, const void*)
 
 #if FMT_USE_NULLPTR
 FMT_MAKE_VALUE(pointer_type, std::nullptr_t, const void*)
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
index 11c9e525..ac61d93a 100644
--- a/include/fmt/format-inl.h
+++ b/include/fmt/format-inl.h
@@ -45,12 +45,6 @@
 # define FMT_CATCH(x) if (false)
 #endif
 
-#ifdef __GNUC__
-// Disable the warning about declaration shadowing because it affects too
-// many valid cases.
-# pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4127)  // conditional expression is constant
@@ -71,9 +65,6 @@ inline fmt::internal::null<> strerror_s(char *, std::size_t, ...) {
 
 FMT_BEGIN_NAMESPACE
 
-FMT_FUNC format_error::~format_error() throw() {}
-FMT_FUNC system_error::~system_error() FMT_DTOR_NOEXCEPT {}
-
 namespace {
 
 #ifndef _MSC_VER
diff --git a/include/fmt/format.h b/include/fmt/format.h
index c604288a..0851a913 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -37,6 +37,33 @@
 #include <stdexcept>
 #include <stdint.h>
 
+#ifdef __clang__
+# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
+#else
+# define FMT_CLANG_VERSION 0
+#endif
+
+#ifdef __INTEL_COMPILER
+# define FMT_ICC_VERSION __INTEL_COMPILER
+#elif defined(__ICL)
+# define FMT_ICC_VERSION __ICL
+#else
+# define FMT_ICC_VERSION 0
+#endif
+
+#if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 406) || \
+    FMT_CLANG_VERSION
+# pragma GCC diagnostic push
+
+// Disable the warning about declaration shadowing because it affects too
+// many valid cases.
+# pragma GCC diagnostic ignored "-Wshadow"
+
+// Disable the warning about implicit conversions that may change the sign of
+// an integer; silencing it otherwise would require many explicit casts.
+# pragma GCC diagnostic ignored "-Wsign-conversion"
+#endif
+
 #include "core.h"
 
 #ifdef _SECURE_SCL
@@ -55,47 +82,10 @@
 # define FMT_HAS_BUILTIN(x) 0
 #endif
 
-#ifdef __GNUC__
-# if FMT_GCC_VERSION >= 406
-#  pragma GCC diagnostic push
-
-// Disable the warning about declaration shadowing because it affects too
-// many valid cases.
-#  pragma GCC diagnostic ignored "-Wshadow"
-
-// Disable the warning about implicit conversions that may change the sign of
-// an integer; silencing it otherwise would require many explicit casts.
-#  pragma GCC diagnostic ignored "-Wsign-conversion"
-# endif
-#endif
-
-#ifdef __clang__
-# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
-#endif
-
-#if defined(__INTEL_COMPILER)
-# define FMT_ICC_VERSION __INTEL_COMPILER
-#elif defined(__ICL)
-# define FMT_ICC_VERSION __ICL
-#endif
-
-#if defined(__clang__) && !defined(FMT_ICC_VERSION)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
-# pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
-# pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 #ifdef __GNUC_LIBSTD__
 # define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__)
 #endif
 
-#ifdef __has_cpp_attribute
-# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-# define FMT_HAS_CPP_ATTRIBUTE(x) 0
-#endif
-
 #ifndef FMT_THROW
 # if FMT_EXCEPTIONS
 #  if FMT_MSC_VER
@@ -116,7 +106,7 @@ FMT_END_NAMESPACE
 #   define FMT_THROW(x) throw x
 #  endif
 # else
-#  define FMT_THROW(x) assert(false)
+#  define FMT_THROW(x) do { static_cast<void>(sizeof(x)); assert(false); } while(false);
 # endif
 #endif
 
@@ -124,7 +114,7 @@ FMT_END_NAMESPACE
 // For Intel's compiler both it and the system gcc/msc must support UDLs.
 # if (FMT_HAS_FEATURE(cxx_user_literals) || \
       FMT_GCC_VERSION >= 407 || FMT_MSC_VER >= 1900) && \
-      (!defined(FMT_ICC_VERSION) || FMT_ICC_VERSION >= 1500)
+      (!FMT_ICC_VERSION || FMT_ICC_VERSION >= 1500)
 #  define FMT_USE_USER_DEFINED_LITERALS 1
 # else
 #  define FMT_USE_USER_DEFINED_LITERALS 0
@@ -142,7 +132,8 @@ FMT_END_NAMESPACE
 #ifndef FMT_USE_EXTERN_TEMPLATES
 # ifndef FMT_HEADER_ONLY
 #  define FMT_USE_EXTERN_TEMPLATES \
-     (FMT_CLANG_VERSION >= 209 || (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11))
+     ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \
+      (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11))
 # else
 #  define FMT_USE_EXTERN_TEMPLATES 0
 # endif
@@ -151,6 +142,14 @@ FMT_END_NAMESPACE
 #if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_trailing_return) || \
     FMT_MSC_VER >= 1600
 # define FMT_USE_TRAILING_RETURN 1
+#else
+# define FMT_USE_TRAILING_RETURN 0
+#endif
+
+#if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_rvalue_references) || FMT_MSC_VER >= 1600
+# define FMT_USE_RVALUE_REFERENCES 1
+#else
+# define FMT_USE_RVALUE_REFERENCES 0
 #endif
 
 #ifndef FMT_USE_GRISU
@@ -284,18 +283,18 @@ class fp {
   typedef uint64_t significand_type;
 
   // All sizes are in bits.
-  static constexpr int char_size = std::numeric_limits<unsigned char>::digits;
+  static FMT_CONSTEXPR_DECL const int char_size = std::numeric_limits<unsigned char>::digits;
   // Subtract 1 to account for an implicit most significant bit in the
   // normalized form.
-  static constexpr int double_significand_size =
+  static FMT_CONSTEXPR_DECL const int double_significand_size =
     std::numeric_limits<double>::digits - 1;
-  static constexpr uint64_t implicit_bit = 1ull << double_significand_size;
+  static FMT_CONSTEXPR_DECL const uint64_t implicit_bit = 1ull << double_significand_size;
 
  public:
   significand_type f;
   int e;
 
-  static constexpr int significand_size = sizeof(significand_type) * char_size;
+  static FMT_CONSTEXPR_DECL const int significand_size = sizeof(significand_type) * char_size;
 
   fp(uint64_t f, int e): f(f), e(e) {}
 
@@ -318,7 +317,7 @@ class fp {
       f += implicit_bit;
     else
       biased_e = 1;  // Subnormals use biased exponent 1 (min exponent).
-    e = biased_e - exponent_bias - double_significand_size;
+    e = static_cast<int>(biased_e - exponent_bias - double_significand_size);
   }
 
   // Normalizes the value converted from double and multiplied by (1 << SHIFT).
@@ -455,8 +454,6 @@ class format_error : public std::runtime_error {
 
   explicit format_error(const std::string &message)
   : std::runtime_error(message) {}
-
-  FMT_API ~format_error() throw();
 };
 
 namespace internal {
@@ -1673,6 +1670,13 @@ FMT_CONSTEXPR unsigned parse_nonnegative_int(Iterator &it, ErrorHandler &&eh) {
   return value;
 }
 
+#if FMT_MSC_VER
+// Warns that the compiler cannot generate an assignment operator
+// The class has a reference member variable, so this is obviously the case
+# pragma warning(push)
+# pragma warning(disable: 4512)
+#endif
+
 template <typename Char, typename Context>
 class custom_formatter: public function<bool> {
  private:
@@ -1690,6 +1694,10 @@ class custom_formatter: public function<bool> {
   bool operator()(T) const { return false; }
 };
 
+#if FMT_MSC_VER
+# pragma warning(pop)
+#endif
+
 template <typename T>
 struct is_integer {
   enum {
@@ -2380,8 +2388,6 @@ class system_error : public std::runtime_error {
     init(error_code, message, make_format_args(args...));
   }
 
-  FMT_API ~system_error() FMT_DTOR_NOEXCEPT;
-
   int error_code() const { return error_code_; }
 };
 
@@ -2650,7 +2656,7 @@ class basic_writer {
   };
 
   struct double_writer {
-    unsigned n;
+    size_t n;
     char sign;
     basic_memory_buffer<char_type> &buffer;
 
@@ -2904,12 +2910,12 @@ void basic_writer<Range>::write_double(T value, const format_specs &spec) {
     internal::fp product = fp_value * dec_pow;
     // Generate output.
     internal::fp one(1ull << -product.e, product.e);
-    uint32_t hi = product.f >> -one.e;
+    uint64_t hi = product.f >> -one.e;
     uint64_t f = product.f & (one.f - 1);
     typedef back_insert_range<internal::basic_buffer<char_type>> range;
     basic_writer<range> w{range(buffer)};
     w.write(hi);
-    unsigned digits = buffer.size();
+    size_t digits = buffer.size();
     w.write('.');
     const unsigned max_digits = 18;
     while (digits++ < max_digits) {
@@ -2924,7 +2930,7 @@ void basic_writer<Range>::write_double(T value, const format_specs &spec) {
     normalized_spec.type_ = handler.type;
     write_double_sprintf(value, normalized_spec, buffer);
   }
-  unsigned n = buffer.size();
+  size_t n = buffer.size();
   align_spec as = spec;
   if (spec.align() == ALIGN_NUMERIC) {
     if (sign) {
@@ -3215,8 +3221,8 @@ struct formatter<
     internal::handle_dynamic_spec<internal::precision_checker>(
       specs_.precision_, specs_.precision_ref, ctx);
     typedef output_range<typename FormatContext::iterator,
-                         typename FormatContext::char_type> range;
-    visit(arg_formatter<range>(ctx, specs_),
+                         typename FormatContext::char_type> range_type;
+    visit(arg_formatter<range_type>(ctx, specs_),
           internal::make_arg<FormatContext>(val));
     return ctx.out();
   }
@@ -3702,7 +3708,7 @@ FMT_END_NAMESPACE
 
 #define FMT_STRING(s) [] { \
     struct S : fmt::format_string { \
-      static FMT_CONSTEXPR auto data() { return s; } \
+      static FMT_CONSTEXPR decltype(s) data() { return s; } \
       static FMT_CONSTEXPR size_t size() { return sizeof(s); } \
     }; \
     return S{}; \
@@ -3731,12 +3737,8 @@ FMT_END_NAMESPACE
 #endif
 
 // Restore warnings.
-#if FMT_GCC_VERSION >= 406
+#if FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION
 # pragma GCC diagnostic pop
 #endif
 
-#if defined(__clang__) && !defined(FMT_ICC_VERSION)
-# pragma clang diagnostic pop
-#endif
-
 #endif  // FMT_FORMAT_H_
diff --git a/include/fmt/printf.h b/include/fmt/printf.h
index e9a81669..ea383783 100644
--- a/include/fmt/printf.h
+++ b/include/fmt/printf.h
@@ -52,7 +52,7 @@ class printf_precision_handler: public function<int> {
   typename std::enable_if<!std::is_integral<T>::value, int>::type
       operator()(T) {
     FMT_THROW(format_error("precision is not integer"));
-    return 0;
+    return 0; // Silence visual studio
   }
 };
 
@@ -194,7 +194,7 @@ class printf_width_handler: public function<unsigned> {
   typename std::enable_if<!std::is_integral<T>::value, unsigned>::type
       operator()(T) {
     FMT_THROW(format_error("width is not integer"));
-    return 0;
+    return 0; // Silence Visual Studio
   }
 };
 }  // namespace internal
@@ -635,8 +635,13 @@ inline int fprintf(std::FILE *f, string_view format_str, const Args & ... args)
 template <typename... Args>
 inline int fprintf(std::FILE *f, wstring_view format_str,
                    const Args & ... args) {
+#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440
+  return vfprintf<wchar_t>(f, format_str,
+    make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
+#else
   return vfprintf(f, format_str,
     make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
+#endif
 }
 
 inline int vprintf(string_view format, printf_args args) {
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
index 40669302..a235ecac 100644
--- a/include/fmt/ranges.h
+++ b/include/fmt/ranges.h
@@ -126,18 +126,39 @@ struct is_tuple_like {
   static FMT_CONSTEXPR_DECL const bool value =
     is_tuple_like_<T>::value && !is_range_<T>::value;
 };
-}  // namespace internal
 
-#if FMT_HAS_FEATURE(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
-# define FMT_USE_INTEGER_SEQUENCE 1
+// Check for integer_sequence
+#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
+template <typename T, T... N>
+using integer_sequence = std::integer_sequence<T, N...>;
+template <std::size_t... N>
+using index_sequence = std::index_sequence<N...>;
+template <std::size_t N>
+using make_index_sequence = std::make_index_sequence<N>;
 #else
-# define FMT_USE_INTEGER_SEQUENCE 0
+template <typename T, T... N>
+struct integer_sequence {
+  typedef T value_type;
+
+  static FMT_CONSTEXPR std::size_t size() {
+    return sizeof...(N);
+  }
+};
+
+template <std::size_t... N>
+using index_sequence = integer_sequence<std::size_t, N...>;
+
+template <typename T, std::size_t N, T... Ns>
+struct make_integer_sequence : make_integer_sequence<T, N - 1, N - 1, Ns...> {};
+template <typename T, T... Ns>
+struct make_integer_sequence<T, 0, Ns...> : integer_sequence<T, Ns...> {};
+
+template <std::size_t N>
+using make_index_sequence = make_integer_sequence<std::size_t, N>;
 #endif
 
-#if FMT_USE_INTEGER_SEQUENCE
-namespace internal {
-template <size_t... Is, class Tuple, class F>
-void for_each(std::index_sequence<Is...>, Tuple &&tup, F &&f) noexcept {
+template <class Tuple, class F, size_t... Is>
+void for_each(index_sequence<Is...>, Tuple &&tup, F &&f) noexcept {
   using std::get;
   // using free function get<I>(T) now.
   const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
@@ -145,7 +166,7 @@ void for_each(std::index_sequence<Is...>, Tuple &&tup, F &&f) noexcept {
 }
 
 template <class T>
-FMT_CONSTEXPR std::make_index_sequence<std::tuple_size<T>::value> 
+FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value> 
 get_indexes(T const &) { return {}; }
 
 template <class Tuple, class F>
@@ -157,21 +178,13 @@ void for_each(Tuple &&tup, F &&f) {
 
 template <typename TupleT, typename Char>
 struct formatter<TupleT, Char, 
-    typename std::enable_if<fmt::internal::is_tuple_like<TupleT>::value>::type> {
-
-  fmt::formatting_tuple<Char> formatting;
-
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
-    return formatting.parse(ctx);
-  }
-
-  template <typename FormatContext = format_context>
-  auto format(const TupleT &values, FormatContext &ctx) -> decltype(ctx.out()) {
-    auto out = ctx.out();
-    std::size_t i = 0;
-    internal::copy(formatting.prefix, out);
-    internal::for_each(values, [&](const auto &v) {
+    typename std::enable_if<internal::is_tuple_like<TupleT>::value>::type> {
+private:
+  // C++11 generic lambda for format()
+  template <typename FormatContext>
+  struct format_each {
+    template <typename T>
+    void operator()(const T& v) {
       if (i > 0) {
         if (formatting.add_prepostfix_space) {
           *out++ = ' ';
@@ -184,7 +197,28 @@ struct formatter<TupleT, Char,
         format_to(out, "{}", v);
       }
       ++i;
-    });
+    }
+
+    formatting_tuple<Char>& formatting;
+    std::size_t& i;
+    typename std::add_lvalue_reference<decltype(std::declval<FormatContext>().out())>::type out;
+  };
+
+public:
+  formatting_tuple<Char> formatting;
+
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
+    return formatting.parse(ctx);
+  }
+
+  template <typename FormatContext = format_context>
+  auto format(const TupleT &values, FormatContext &ctx) -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    std::size_t i = 0;
+    internal::copy(formatting.prefix, out);
+
+    internal::for_each(values, format_each<FormatContext>{formatting, i, out});
     if (formatting.add_prepostfix_space) {
       *out++ = ' ';
     }
@@ -193,13 +227,12 @@ struct formatter<TupleT, Char,
     return ctx.out();
   }
 };
-#endif  // FMT_USE_INTEGER_SEQUENCE
 
 template <typename RangeT, typename Char>
-struct formatter< RangeT, Char,
-    typename std::enable_if<fmt::internal::is_range<RangeT>::value>::type> {
+struct formatter<RangeT, Char,
+    typename std::enable_if<internal::is_range<RangeT>::value>::type> {
 
-  fmt::formatting_range<Char> formatting;
+  formatting_range<Char> formatting;
 
   template <typename ParseContext>
   FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
diff --git a/include/fmt/time.h b/include/fmt/time.h
index 58eb5ca3..515452a4 100644
--- a/include/fmt/time.h
+++ b/include/fmt/time.h
@@ -54,7 +54,6 @@ inline std::tm localtime(std::time_t time) {
     return lt.tm_;
   // Too big time values may be unsupported.
   FMT_THROW(format_error("time_t value out of range"));
-  return std::tm();
 }
 
 // Thread-safe replacement for std::gmtime
@@ -90,7 +89,6 @@ inline std::tm gmtime(std::time_t time) {
     return gt.tm_;
   // Too big time values may be unsupported.
   FMT_THROW(format_error("time_t value out of range"));
-  return std::tm();
 }
 
 namespace internal {
diff --git a/src/posix.cc b/src/posix.cc
index 88f52edf..296da232 100644
--- a/src/posix.cc
+++ b/src/posix.cc
@@ -6,7 +6,7 @@
 // For the license information refer to format.h.
 
 // Disable bogus MSVC warnings.
-#ifndef _CRT_SECURE_NO_WARNINGS
+#if !defined(_CRT_SECURE_NO_WARNINGS) && defined(_MSC_VER)
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 
diff --git a/support/appveyor-build.py b/support/appveyor-build.py
old mode 100755
new mode 100644
index cd6324fe..2cfcb03a
--- a/support/appveyor-build.py
+++ b/support/appveyor-build.py
@@ -6,9 +6,11 @@ from subprocess import check_call
 
 build = os.environ['BUILD']
 config = os.environ['CONFIGURATION']
-platform = os.environ.get('PLATFORM')
+platform = os.environ['PLATFORM']
 path = os.environ['PATH']
-cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config]
+image = os.environ['APPVEYOR_BUILD_WORKER_IMAGE']
+jobid = os.environ['APPVEYOR_JOB_ID']
+cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config, '..']
 if build == 'mingw':
     cmake_command.append('-GMinGW Makefiles')
     build_command = ['mingw32-make', '-j4']
@@ -21,7 +23,12 @@ else:
     # Add MSBuild 14.0 to PATH as described in
     # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
     os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path
-    generator = 'Visual Studio 15 2017'
+    if image == 'Visual Studio 2013':
+        generator = 'Visual Studio 12 2013'
+    elif image == 'Visual Studio 2015':
+        generator = 'Visual Studio 14 2015'
+    elif image == 'Visual Studio 2017':
+        generator = 'Visual Studio 15 2017'
     if platform == 'x64':
         generator += ' Win64'
     cmake_command.append('-G' + generator)
diff --git a/support/appveyor.yml b/support/appveyor.yml
index d7eb8434..a2830588 100644
--- a/support/appveyor.yml
+++ b/support/appveyor.yml
@@ -2,21 +2,32 @@ configuration:
   - Debug
   - Release
 
-image: Visual Studio 2017
+clone_depth: 1
+
+platform:
+  - Win32
+  - x64
+
+image:
+  - Visual Studio 2013
+  - Visual Studio 2015
+  - Visual Studio 2017
 
 environment:
   CTEST_OUTPUT_ON_FAILURE: 1
-  matrix:
-  - BUILD: msvc
-  - BUILD: msvc
-    PLATFORM: x64
+  MSVC_DEFAULT_OPTIONS: ON
+  BUILD: msvc
+
+matrix:
+  allow_failures:
+    - image: Visual Studio 2013
 
 before_build:
-  # Workaround for CMake not wanting sh.exe on PATH for MinGW.
-  - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+ - mkdir build
+ - cd build
 
 build_script:
-  - python support/appveyor-build.py
+  - python ../support/appveyor-build.py
 
 on_failure:
   - appveyor PushArtifact Testing/Temporary/LastTest.log
diff --git a/support/cmake/cxx14.cmake b/support/cmake/cxx14.cmake
index eb2c77e9..1866cdcc 100644
--- a/support/cmake/cxx14.cmake
+++ b/support/cmake/cxx14.cmake
@@ -1,67 +1,52 @@
 # C++14 feature support detection
 
-if (NOT FMT_USE_CPP14)
-  return()
-endif ()
-
+include(CheckCXXSourceCompiles)
 include(CheckCXXCompilerFlag)
 
-if (FMT_USE_CPP14)
-  check_cxx_compiler_flag(-std=c++14 HAVE_STD_CPP14_FLAG)
-  if (HAVE_STD_CPP14_FLAG)
-    # Check if including cmath works with -std=c++14 and -O3.
-    # It may not in MinGW due to bug http://ehc.ac/p/mingw/bugs/2250/.
-    set(CMAKE_REQUIRED_FLAGS "-std=c++14 -O3")
-    check_cxx_source_compiles("
-      #include <cmath>
-      int main() {}" FMT_CPP14_CMATH)
-    # Check if including <unistd.h> works with -std=c++14.
-    # It may not in MinGW due to bug http://sourceforge.net/p/mingw/bugs/2024/.
-    check_cxx_source_compiles("
-      #include <unistd.h>
-      int main() {}" FMT_CPP14_UNISTD_H)
-    # Check if snprintf works with -std=c++14. It may not in MinGW.
-    check_cxx_source_compiles("
-      #include <stdio.h>
-      int main() {
-        char buffer[10];
-        snprintf(buffer, 10, \"foo\");
-      }" FMT_CPP14_SNPRINTF)
-    if (FMT_CPP14_CMATH AND FMT_CPP14_UNISTD_H AND FMT_CPP14_SNPRINTF)
-      set(CPP14_FLAG -std=c++14)
-    else ()
-      check_cxx_compiler_flag(-std=gnu++14 HAVE_STD_GNUPP14_FLAG)
-      if (HAVE_STD_CPP14_FLAG)
-        set(CPP14_FLAG -std=gnu++14)
-      endif ()
-    endif ()
-    set(CMAKE_REQUIRED_FLAGS )
-  else ()
-    check_cxx_compiler_flag(-std=c++1y HAVE_STD_CPP1Y_FLAG)
-    if (HAVE_STD_CPP1Y_FLAG)
-      set(CPP14_FLAG -std=c++1y)
-    else ()
-      # Fallback on c++11 if c++14 is not available.
-      check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG)
-      if (HAVE_STD_CPP11_FLAG)
-        set(CPP14_FLAG -std=c++11)
-      else ()
-        check_cxx_compiler_flag(-std=c++0x HAVE_STD_CPP0X_FLAG)
-        if (HAVE_STD_CPP0X_FLAG)
-          set(CPP14_FLAG -std=c++0x)
-        endif ()
-      endif ()
-    endif ()
+if (NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11)
+endif()
+message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
+
+if (CMAKE_CXX_STANDARD EQUAL 20)
+  check_cxx_compiler_flag(-std=c++20 has_std_20_flag)
+  check_cxx_compiler_flag(-std=c++2a has_std_2a_flag)
+
+  if (has_std_20_flag)
+    set(CXX_STANDARD_FLAG -std=c++20)
+  elseif (has_std_2a_flag)
+    set(CXX_STANDARD_FLAG -std=c++2a)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 17)
+  check_cxx_compiler_flag(-std=c++17 has_std_17_flag)
+  check_cxx_compiler_flag(-std=c++1z has_std_1z_flag)
+
+  if (has_std_17_flag)
+    set(CXX_STANDARD_FLAG -std=c++17)
+  elseif (has_std_1z_flag)
+    set(CXX_STANDARD_FLAG -std=c++1z)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 14)
+  check_cxx_compiler_flag(-std=c++14 has_std_14_flag)
+  check_cxx_compiler_flag(-std=c++1y has_std_1y_flag)
+
+  if (has_std_14_flag)
+    set(CXX_STANDARD_FLAG -std=c++14)
+  elseif (has_std_1y_flag)
+    set(CXX_STANDARD_FLAG -std=c++1y)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 11)
+  check_cxx_compiler_flag(-std=c++11 has_std_11_flag)
+  check_cxx_compiler_flag(-std=c++0x has_std_0x_flag)
+
+  if (has_std_11_flag)
+    set(CXX_STANDARD_FLAG -std=c++11)
+  elseif (has_std_0x_flag)
+    set(CXX_STANDARD_FLAG -std=c++0x)
   endif ()
 endif ()
 
-if (CMAKE_CXX_STANDARD)
-  # Don't use -std compiler flag if CMAKE_CXX_STANDARD is specified.
-  set(CPP14_FLAG )
-endif ()
-
-message(STATUS "CPP14_FLAG: ${CPP14_FLAG}")
-set(CMAKE_REQUIRED_FLAGS ${CPP14_FLAG})
+set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG})
 
 # Check if variadic templates are working and not affected by GCC bug 39653:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39653
@@ -69,17 +54,26 @@ check_cxx_source_compiles("
   template <class T, class ...Types>
   struct S { typedef typename S<Types...>::type type; };
   int main() {}" SUPPORTS_VARIADIC_TEMPLATES)
+if (NOT SUPPORTS_VARIADIC_TEMPLATES)
+  set (SUPPORTS_VARIADIC_TEMPLATES OFF)
+endif ()
 
 # Check if initializer lists are supported.
 check_cxx_source_compiles("
   #include <initializer_list>
   int main() {}" SUPPORTS_INITIALIZER_LIST)
+if (NOT SUPPORTS_INITIALIZER_LIST)
+  set (SUPPORTS_INITIALIZER_LIST OFF)
+endif ()
 
 # Check if enum bases are available
 check_cxx_source_compiles("
   enum C : char {A};
   int main() {}"
   SUPPORTS_ENUM_BASE)
+if (NOT SUPPORTS_ENUM_BASE)
+  set (SUPPORTS_ENUM_BASE OFF)
+endif ()
 
 # Check if type traits are available
 check_cxx_source_compiles("
@@ -87,11 +81,17 @@ check_cxx_source_compiles("
   class C { void operator=(const C&); };
   int main() { static_assert(!std::is_copy_assignable<C>::value, \"\"); }"
   SUPPORTS_TYPE_TRAITS)
+if (NOT SUPPORTS_TYPE_TRAITS)
+  set (SUPPORTS_TYPE_TRAITS OFF)
+endif ()
 
 # Check if user-defined literals are available
 check_cxx_source_compiles("
   void operator\"\" _udl(long double);
   int main() {}"
   SUPPORTS_USER_DEFINED_LITERALS)
+if (NOT SUPPORTS_USER_DEFINED_LITERALS)
+  set (SUPPORTS_USER_DEFINED_LITERALS OFF)
+endif ()
 
 set(CMAKE_REQUIRED_FLAGS )
diff --git a/support/travis-build.py b/support/travis-build.py
index baefc1d4..d71a7ae6 100755
--- a/support/travis-build.py
+++ b/support/travis-build.py
@@ -2,8 +2,8 @@
 # Build the project on Travis CI.
 
 from __future__ import print_function
-import errno, os, re, shutil, subprocess, sys, tempfile, urllib
-from subprocess import call, check_call, check_output, Popen, PIPE, STDOUT
+import errno, os, shutil, subprocess, sys, urllib
+from subprocess import call, check_call, Popen, PIPE, STDOUT
 
 def rmtree_if_exists(dir):
     try:
@@ -85,14 +85,12 @@ test_build_dir = os.path.join(fmt_dir, "_build_test")
 
 # Configure library.
 makedirs_if_not_exist(build_dir)
-common_cmake_flags = [
-    '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build
+cmake_flags = [
+    '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build,
+    '-DCMAKE_CXX_STANDARD=' + standard
 ]
-extra_cmake_flags = []
-if standard != '14':
-    extra_cmake_flags = ['-DCMAKE_CXX_FLAGS=-std=c++' + standard]
-check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', fmt_dir] +
-           common_cmake_flags + extra_cmake_flags, cwd=build_dir)
+check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', '-DFMT_WERROR=ON', fmt_dir] +
+           cmake_flags, cwd=build_dir)
 
 # Build library.
 check_call(['make', '-j4'], cwd=build_dir)
@@ -101,7 +99,7 @@ check_call(['make', '-j4'], cwd=build_dir)
 env = os.environ.copy()
 env['CTEST_OUTPUT_ON_FAILURE'] = '1'
 if call(['make', 'test'], env=env, cwd=build_dir):
-    with open('Testing/Temporary/LastTest.log', 'r') as f:
+    with open(os.path.join(build_dir, 'Testing', 'Temporary', 'LastTest.log'), 'r') as f:
         print(f.read())
     sys.exit(-1)
 
@@ -110,7 +108,6 @@ check_call(['make', 'install'], cwd=build_dir)
 
 # Test installation.
 makedirs_if_not_exist(test_build_dir)
-check_call(['cmake', '-DCMAKE_CXX_FLAGS=-std=c++' + standard,
-                     os.path.join(fmt_dir, "test", "find-package-test")] +
-           common_cmake_flags, cwd=test_build_dir)
+check_call(['cmake', os.path.join(fmt_dir, "test", "find-package-test")] +
+            cmake_flags, cwd=test_build_dir)
 check_call(['make', '-j4'], cwd=test_build_dir)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 07b10a0a..1a8c900a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,9 +7,8 @@
 # at http://code.google.com/p/googletest/wiki/FAQ for more details.
 add_library(gmock STATIC
   gmock-gtest-all.cc gmock/gmock.h gtest/gtest.h gtest/gtest-spi.h)
-target_compile_options(gmock PUBLIC ${CPP14_FLAG})
 target_compile_definitions(gmock PUBLIC GTEST_HAS_STD_WSTRING=1)
-target_include_directories(gmock PUBLIC .)
+target_include_directories(gmock SYSTEM PUBLIC . gmock gtest)
 
 find_package(Threads)
 if (Threads_FOUND)
@@ -43,6 +42,7 @@ set(TEST_MAIN_SRC test-main.cc gtest-extra.cc gtest-extra.h util.cc)
 add_library(test-main STATIC ${TEST_MAIN_SRC})
 target_compile_definitions(test-main PUBLIC
   FMT_USE_FILE_DESCRIPTORS=$<BOOL:${HAVE_OPEN}>)
+target_include_directories(test-main SYSTEM PUBLIC gtest gmock)
 target_link_libraries(test-main gmock fmt)
 
 include(CheckCXXCompilerFlag)
@@ -57,7 +57,7 @@ endif ()
 # Use less strict pedantic flags for the tests because GMock doesn't compile
 # cleanly with -pedantic and -std=c++98.
 if (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-  set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wno-long-long -Wno-variadic-macros)
+    #set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wno-long-long -Wno-variadic-macros)
 endif ()
 
 function(add_fmt_executable name)
@@ -80,6 +80,7 @@ function(add_fmt_test name)
   if (FMT_PEDANTIC)
     target_compile_options(${name} PRIVATE ${PEDANTIC_COMPILE_FLAGS})
   endif ()
+  target_include_directories(${name} SYSTEM PUBLIC gtest gmock)
   add_test(NAME ${name} COMMAND ${name})
 endfunction()
 
@@ -94,12 +95,6 @@ add_fmt_test(util-test mock-allocator.h)
 add_fmt_test(custom-formatter-test)
 add_fmt_test(ranges-test)
 
-# Enable stricter options for one test to make sure that the header is free of
-# warnings.
-if (FMT_PEDANTIC AND MSVC)
-  target_compile_options(format-test PRIVATE /W4)
-endif ()
-
 if (HAVE_OPEN)
   add_fmt_executable(posix-mock-test
     posix-mock-test.cc ../src/format.cc ${TEST_MAIN_SRC})
@@ -107,6 +102,10 @@ if (HAVE_OPEN)
     posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
   target_compile_definitions(posix-mock-test PRIVATE FMT_USE_FILE_DESCRIPTORS=1)
   target_link_libraries(posix-mock-test gmock)
+  target_include_directories(posix-mock-test SYSTEM PUBLIC gtest gmock)
+  if (FMT_PEDANTIC)
+    target_compile_options(posix-mock-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+  endif ()
   add_test(NAME posix-mock-test COMMAND posix-mock-test)
   add_fmt_test(posix-test)
 endif ()
@@ -114,6 +113,7 @@ endif ()
 add_fmt_executable(header-only-test
   header-only-test.cc header-only-test2.cc test-main.cc)
 target_link_libraries(header-only-test gmock)
+target_include_directories(header-only-test SYSTEM PUBLIC gtest gmock)
 if (TARGET fmt-header-only)
   target_link_libraries(header-only-test fmt-header-only)
 else ()
@@ -126,20 +126,28 @@ endif ()
 check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG)
 if (HAVE_FNO_EXCEPTIONS_FLAG)
   add_library(noexception-test ../src/format.cc)
-  target_compile_options(noexception-test PUBLIC ${CPP14_FLAG})
   target_include_directories(
     noexception-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
   target_compile_options(noexception-test PRIVATE -fno-exceptions)
+  if (FMT_PEDANTIC)
+    target_compile_options(noexception-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+  endif ()
+  target_include_directories(noexception-test SYSTEM PUBLIC gtest gmock)
 endif ()
 
+message(STATUS "FMT_PEDANTIC: ${FMT_PEDANTIC}")
+
 if (FMT_PEDANTIC)
   # Test that the library compiles without windows.h.
   if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     add_library(no-windows-h-test ../src/format.cc)
-    target_compile_options(no-windows-h-test PUBLIC ${CPP14_FLAG})
     target_include_directories(
       no-windows-h-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
     target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0)
+    if (FMT_PEDANTIC)
+      target_compile_options(no-windows-h-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+    endif ()
+    target_include_directories(no-windows-h-test SYSTEM PUBLIC gtest gmock)
   endif ()
 
   add_test(compile-test ${CMAKE_CTEST_COMMAND}
@@ -148,9 +156,11 @@ if (FMT_PEDANTIC)
     "${CMAKE_CURRENT_BINARY_DIR}/compile-test"
     --build-generator ${CMAKE_GENERATOR}
     --build-makeprogram ${CMAKE_MAKE_PROGRAM}
-    --build-options 
+    --build-options
     "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-    "-DCPP14_FLAG=${CPP14_FLAG}"
+    "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+    "-DCXX_STANDARD_FLAG=${CXX_STANDARD_FLAG}"
+    "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}"
     "-DSUPPORTS_USER_DEFINED_LITERALS=${SUPPORTS_USER_DEFINED_LITERALS}")
 
   # test if the targets are findable from the build directory
@@ -163,8 +173,9 @@ if (FMT_PEDANTIC)
     --build-makeprogram ${CMAKE_MAKE_PROGRAM}
     --build-options
     "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-    "-DCPP14_FLAG=${CPP14_FLAG}"
+    "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
     "-DFMT_DIR=${PROJECT_BINARY_DIR}"
+    "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}"
     "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
   # test if the targets are findable when add_subdirectory is used
@@ -177,6 +188,7 @@ if (FMT_PEDANTIC)
     --build-makeprogram ${CMAKE_MAKE_PROGRAM}
     --build-options
     "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-    "-DCPP14_FLAG=${CPP14_FLAG}"
+    "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+    "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}"
     "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 endif ()
diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt
index 4a4441c5..db7054bd 100644
--- a/test/add-subdirectory-test/CMakeLists.txt
+++ b/test/add-subdirectory-test/CMakeLists.txt
@@ -1,15 +1,17 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1.0)
 
 project(fmt-test)
 
 add_subdirectory(../.. fmt)
 
 add_executable(library-test "main.cc")
-target_compile_options(library-test PUBLIC ${CPP14_FLAG})
 target_link_libraries(library-test fmt::fmt)
+target_compile_options(library-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+target_include_directories(library-test PUBLIC SYSTEM .)
 
 if (TARGET fmt::fmt-header-only)
   add_executable(header-only-test "main.cc")
-  target_compile_options(header-only-test PUBLIC ${CPP14_FLAG})
   target_link_libraries(header-only-test fmt::fmt-header-only)
+  target_compile_options(header-only-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+  target_include_directories(header-only-test PUBLIC SYSTEM .)
 endif ()
diff --git a/test/assert-test.cc b/test/assert-test.cc
index 29c6d40b..8af9b09f 100644
--- a/test/assert-test.cc
+++ b/test/assert-test.cc
@@ -6,7 +6,7 @@
 // For the license information refer to format.h.
 
 #include "fmt/core.h"
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 #if GTEST_HAS_DEATH_TEST
 # define EXPECT_DEBUG_DEATH_IF_SUPPORTED(statement, regex) \
diff --git a/test/compile-test/CMakeLists.txt b/test/compile-test/CMakeLists.txt
index dda1fb96..75a0c5a5 100644
--- a/test/compile-test/CMakeLists.txt
+++ b/test/compile-test/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Test if compile errors are produced where necessary.
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1.0)
 
 include(CheckCXXSourceCompiles)
+include(CheckCXXCompilerFlag)
+
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-set(CMAKE_REQUIRED_FLAGS ${CPP14_FLAG})
+set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG} ${PEDANTIC_COMPILE_FLAGS})
 
 function (generate_source result fragment)
   set(${result} "
diff --git a/test/custom-formatter-test.cc b/test/custom-formatter-test.cc
index dd513a59..919291ad 100644
--- a/test/custom-formatter-test.cc
+++ b/test/custom-formatter-test.cc
@@ -22,13 +22,21 @@ class custom_arg_formatter :
   using base::operator();
 
   iterator operator()(double value) {
-    if (round(value * pow(10, spec().precision())) == 0)
+#if FMT_GCC_VERSION
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    // Comparing a float to 0.0 is safe
+    if (round(value * pow(10, spec().precision())) == 0.0)
       value = 0;
     return base::operator()(value);
+#if FMT_GCC_VERSION
+#pragma GCC diagnostic pop
+#endif
   }
 };
 
-std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) {
+static std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) {
   fmt::memory_buffer buffer;
   // Pass custom argument formatter as a template arg to vwrite.
   fmt::vformat_to<custom_arg_formatter>(buffer, format_str, args);
diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt
index e860879c..51357557 100644
--- a/test/find-package-test/CMakeLists.txt
+++ b/test/find-package-test/CMakeLists.txt
@@ -1,15 +1,17 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1.0)
 
 project(fmt-test)
 
 find_package(FMT REQUIRED)
 
 add_executable(library-test main.cc)
-target_compile_options(library-test PUBLIC ${CPP14_FLAG})
 target_link_libraries(library-test fmt::fmt)
+target_compile_options(library-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+target_include_directories(library-test PUBLIC SYSTEM .)
 
 if (TARGET fmt::fmt-header-only)
   add_executable(header-only-test main.cc)
-  target_compile_options(header-only-test PUBLIC ${CPP14_FLAG})
   target_link_libraries(header-only-test fmt::fmt-header-only)
+  target_compile_options(header-only-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
+  target_include_directories(header-only-test PUBLIC SYSTEM .)
 endif ()
diff --git a/test/format-impl-test.cc b/test/format-impl-test.cc
index 79ddd396..0daf00f5 100644
--- a/test/format-impl-test.cc
+++ b/test/format-impl-test.cc
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 
@@ -30,9 +30,8 @@ struct ValueExtractor: fmt::internal::function<T> {
   }
 
   template <typename U>
-  T operator()(U) {
+  FMT_NORETURN T operator()(U) {
     throw std::runtime_error(fmt::format("invalid type {}", typeid(U).name()));
-    return T();
   }
 };
 
@@ -53,9 +52,9 @@ TEST(FormatTest, FormatNegativeNaN) {
 }
 
 TEST(FormatTest, StrError) {
-  char *message = 0;
+  char *message = nullptr;
   char buffer[BUFFER_SIZE];
-  EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = 0, 0), "invalid buffer");
+  EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = nullptr, 0), "invalid buffer");
   EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = buffer, 0),
                 "invalid buffer");
   buffer[0] = 'x';
diff --git a/test/format-test.cc b/test/format-test.cc
index 77db41a9..7fd66643 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -14,7 +14,7 @@
 #include <memory>
 #include <stdint.h>
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 
 // Test that the library compiles if None is defined to 0 as done by xlib.h.
 #define None 0
@@ -1030,7 +1030,7 @@ TEST(FormatterTest, FormatCString) {
   EXPECT_EQ("test", format("{0:s}", "test"));
   char nonconst[] = "nonconst";
   EXPECT_EQ("nonconst", format("{0}", nonconst));
-  EXPECT_THROW_MSG(format("{0}", reinterpret_cast<const char*>(0)),
+  EXPECT_THROW_MSG(format("{0}", static_cast<const char*>(nullptr)),
       format_error, "string pointer is null");
 }
 
@@ -1052,7 +1052,7 @@ TEST(FormatterTest, FormatUCharString) {
 
 TEST(FormatterTest, FormatPointer) {
   check_unknown_types(reinterpret_cast<void*>(0x1234), "p", "pointer");
-  EXPECT_EQ("0x0", format("{0}", reinterpret_cast<void*>(0)));
+  EXPECT_EQ("0x0", format("{0}", static_cast<void*>(nullptr)));
   EXPECT_EQ("0x1234", format("{0}", reinterpret_cast<void*>(0x1234)));
   EXPECT_EQ("0x1234", format("{0:p}", reinterpret_cast<void*>(0x1234)));
   EXPECT_EQ("0x" + std::string(sizeof(void*) * CHAR_BIT / 4, 'f'),
@@ -1154,7 +1154,7 @@ TEST(FormatterTest, FormatExamples) {
   FILE *ftest = safe_fopen(filename, "r");
   if (ftest) fclose(ftest);
   int error_code = errno;
-  EXPECT_TRUE(ftest == 0);
+  EXPECT_TRUE(ftest == nullptr);
   EXPECT_SYSTEM_ERROR({
     FILE *f = safe_fopen(filename, "r");
     if (!f)
@@ -1315,7 +1315,7 @@ TEST(StrTest, Convert) {
   EXPECT_EQ("2012-12-9", s);
 }
 
-std::string vformat_message(int id, const char *format, fmt::format_args args) {
+static std::string vformat_message(int id, const char *format, fmt::format_args args) {
   fmt::memory_buffer buffer;
   format_to(buffer, "[{}] ", id);
   vformat_to(buffer, format, args);
@@ -1427,7 +1427,7 @@ class mock_arg_formatter:
   }
 };
 
-void custom_vformat(fmt::string_view format_str, fmt::format_args args) {
+static void custom_vformat(fmt::string_view format_str, fmt::format_args args) {
   fmt::memory_buffer buffer;
   fmt::vformat_to<mock_arg_formatter>(buffer, format_str, args);
 }
@@ -1522,6 +1522,9 @@ TEST(FormatTest, FormatToN) {
   EXPECT_EQ(6u, result.size);
   EXPECT_EQ(buffer + 3, result.out);
   EXPECT_EQ("foox", fmt::string_view(buffer, 4));
+
+  // Workaround for potentially unused macro
+  static_cast<void>(None);
 }
 
 #if FMT_USE_CONSTEXPR
@@ -1800,12 +1803,14 @@ FMT_CONSTEXPR bool test_error(const char *fmt, const char *expected_error) {
   return equal(actual_error, expected_error);
 }
 
+#define EXPECT_ERROR_NOARGS(fmt, error) \
+  static_assert(test_error(fmt, error), "")
 #define EXPECT_ERROR(fmt, error, ...) \
   static_assert(test_error<__VA_ARGS__>(fmt, error), "")
 
 TEST(FormatTest, FormatStringErrors) {
-  EXPECT_ERROR("foo", nullptr);
-  EXPECT_ERROR("}", "unmatched '}' in format string");
+  EXPECT_ERROR_NOARGS("foo", nullptr);
+  EXPECT_ERROR_NOARGS("}", "unmatched '}' in format string");
   EXPECT_ERROR("{0:s", "unknown format specifier", Date);
 #ifndef _MSC_VER
   // This causes an internal compiler error in MSVC2017.
@@ -1813,7 +1818,7 @@ TEST(FormatTest, FormatStringErrors) {
   EXPECT_ERROR("{:{<}", "invalid fill character '{'", int);
   EXPECT_ERROR("{:10000000000}", "number is too big", int);
   EXPECT_ERROR("{:.10000000000}", "number is too big", int);
-  EXPECT_ERROR("{:x}", "argument index out of range");
+  EXPECT_ERROR_NOARGS("{:x}", "argument index out of range");
   EXPECT_ERROR("{:=}", "format specifier requires numeric argument",
                const char *);
   EXPECT_ERROR("{:+}", "format specifier requires numeric argument",
@@ -1840,15 +1845,15 @@ TEST(FormatTest, FormatStringErrors) {
   EXPECT_ERROR("{:s}", "invalid type specifier", void *);
 #endif
   EXPECT_ERROR("{foo", "missing '}' in format string", int);
-  EXPECT_ERROR("{10000000000}", "number is too big");
-  EXPECT_ERROR("{0x}", "invalid format string");
-  EXPECT_ERROR("{-}", "invalid format string");
+  EXPECT_ERROR_NOARGS("{10000000000}", "number is too big");
+  EXPECT_ERROR_NOARGS("{0x}", "invalid format string");
+  EXPECT_ERROR_NOARGS("{-}", "invalid format string");
   EXPECT_ERROR("{:{0x}}", "invalid format string", int);
   EXPECT_ERROR("{:{-}}", "invalid format string", int);
   EXPECT_ERROR("{:.{0x}}", "invalid format string", int);
   EXPECT_ERROR("{:.{-}}", "invalid format string", int);
   EXPECT_ERROR("{:.x}", "missing precision specifier", int);
-  EXPECT_ERROR("{}", "argument index out of range");
+  EXPECT_ERROR_NOARGS("{}", "argument index out of range");
   EXPECT_ERROR("{1}", "argument index out of range", int);
   EXPECT_ERROR("{1}{}",
                "cannot switch from manual to automatic argument indexing",
diff --git a/test/gmock-gtest-all.cc b/test/gmock-gtest-all.cc
index 1a63a8ce..7dca684c 100644
--- a/test/gmock-gtest-all.cc
+++ b/test/gmock-gtest-all.cc
@@ -36,7 +36,7 @@
 
 // This line ensures that gtest.h can be compiled on its own, even
 // when it's fused.
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 // The following lines pull in the real gtest *.cc files.
 // Copyright 2005, Google Inc.
diff --git a/test/gmock/gmock.h b/test/gmock/gmock.h
index 8fd9c90c..2a9cbd53 100644
--- a/test/gmock/gmock.h
+++ b/test/gmock/gmock.h
@@ -235,7 +235,7 @@
 
 // Most of the types needed for porting Google Mock are also required
 // for Google Test and are defined in gtest-port.h.
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 // To avoid conditional compilation everywhere, we make it
 // gmock-port.h's responsibility to #include the header implementing
diff --git a/test/gtest-extra-test.cc b/test/gtest-extra-test.cc
index 8e42d8e2..13596b18 100644
--- a/test/gtest-extra-test.cc
+++ b/test/gtest-extra-test.cc
@@ -340,10 +340,10 @@ TEST(OutputRedirectTest, FlushErrorInCtor) {
   // Put a character in a file buffer.
   EXPECT_EQ('x', fputc('x', f.get()));
   FMT_POSIX(close(write_fd));
-  scoped_ptr<OutputRedirect> redir;
+  scoped_ptr<OutputRedirect> redir{nullptr};
   EXPECT_SYSTEM_ERROR_NOASSERT(redir.reset(new OutputRedirect(f.get())),
       EBADF, "cannot flush stream");
-  redir.reset();
+  redir.reset(nullptr);
   write_copy.dup2(write_fd);  // "undo" close or dtor will fail
 }
 
@@ -352,7 +352,7 @@ TEST(OutputRedirectTest, DupErrorInCtor) {
   int fd = (f.fileno)();
   file copy = file::dup(fd);
   FMT_POSIX(close(fd));
-  scoped_ptr<OutputRedirect> redir;
+  scoped_ptr<OutputRedirect> redir{nullptr};
   EXPECT_SYSTEM_ERROR_NOASSERT(redir.reset(new OutputRedirect(f.get())),
       EBADF, fmt::format("cannot duplicate file descriptor {}", fd));
   copy.dup2(fd);  // "undo" close or dtor will fail
@@ -403,7 +403,7 @@ TEST(OutputRedirectTest, ErrorInDtor) {
       // output in EXPECT_STDERR and the second close will break output
       // redirection.
       FMT_POSIX(close(write_fd));
-      SUPPRESS_ASSERT(redir.reset());
+      SUPPRESS_ASSERT(redir.reset(nullptr));
   }, format_system_error(EBADF, "cannot flush stream"));
   write_copy.dup2(write_fd); // "undo" close or dtor of buffered_file will fail
 }
diff --git a/test/gtest-extra.cc b/test/gtest-extra.cc
index 2c4c34a7..2e5ea3e3 100644
--- a/test/gtest-extra.cc
+++ b/test/gtest-extra.cc
@@ -75,7 +75,7 @@ std::string read(file &f, std::size_t count) {
   do {
     n = f.read(&buffer[offset], count - offset);
     // We can't read more than size_t bytes since count has type size_t.
-    offset += static_cast<std::size_t>(n);
+    offset += n;
   } while (offset < count && n != 0);
   buffer.resize(offset);
   return buffer;
diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index db0323d2..c3728f53 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -9,7 +9,7 @@
 #define FMT_GTEST_EXTRA_H_
 
 #include <string>
-#include <gmock/gmock.h>
+#include "gmock.h"
 
 #include "fmt/core.h"
 
@@ -155,7 +155,7 @@ std::string read(fmt::file &f, std::size_t count);
 template <typename Mock>
 struct ScopedMock : testing::StrictMock<Mock> {
   ScopedMock() { Mock::instance = this; }
-  ~ScopedMock() { Mock::instance = 0; }
+  ~ScopedMock() { Mock::instance = nullptr; }
 };
 
 #endif  // FMT_GTEST_EXTRA_H_
diff --git a/test/mock-allocator.h b/test/mock-allocator.h
index e32b3816..58e157a5 100644
--- a/test/mock-allocator.h
+++ b/test/mock-allocator.h
@@ -8,7 +8,7 @@
 #ifndef FMT_MOCK_ALLOCATOR_H_
 #define FMT_MOCK_ALLOCATOR_H_
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 
 template <typename T>
 class MockAllocator {
@@ -28,7 +28,7 @@ class AllocatorRef {
  public:
   typedef typename Allocator::value_type value_type;
 
-  explicit AllocatorRef(Allocator *alloc = 0) : alloc_(alloc) {}
+  explicit AllocatorRef(Allocator *alloc = nullptr) : alloc_(alloc) {}
 
   AllocatorRef(const AllocatorRef &other) : alloc_(other.alloc_) {}
 
@@ -41,7 +41,7 @@ class AllocatorRef {
  private:
   void move(AllocatorRef &other) {
     alloc_ = other.alloc_;
-    other.alloc_ = 0;
+    other.alloc_ = nullptr;
   }
 
  public:
diff --git a/test/ostream-test.cc b/test/ostream-test.cc
index ffc2f8b2..85fea764 100644
--- a/test/ostream-test.cc
+++ b/test/ostream-test.cc
@@ -8,29 +8,29 @@
 #include "fmt/ostream.h"
 
 #include <sstream>
-#include "gmock/gmock.h"
+#include "gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 
 using fmt::format;
 using fmt::format_error;
 
-std::ostream &operator<<(std::ostream &os, const Date &d) {
+static std::ostream &operator<<(std::ostream &os, const Date &d) {
   os << d.year() << '-' << d.month() << '-' << d.day();
   return os;
 }
 
-std::wostream &operator<<(std::wostream &os, const Date &d) {
+static std::wostream &operator<<(std::wostream &os, const Date &d) {
   os << d.year() << L'-' << d.month() << L'-' << d.day();
   return os;
 }
 
 enum TestEnum {};
-std::ostream &operator<<(std::ostream &os, TestEnum) {
+static std::ostream &operator<<(std::ostream &os, TestEnum) {
   return os << "TestEnum";
 }
 
-std::wostream &operator<<(std::wostream &os, TestEnum) {
+static std::wostream &operator<<(std::wostream &os, TestEnum) {
   return os << L"TestEnum";
 }
 
@@ -95,7 +95,7 @@ TEST(OStreamTest, FormatSpecs) {
 }
 
 struct EmptyTest {};
-std::ostream &operator<<(std::ostream &os, EmptyTest) {
+static std::ostream &operator<<(std::ostream &os, EmptyTest) {
   return os << "";
 }
 
@@ -145,7 +145,7 @@ TEST(OStreamTest, WriteToOStreamMaxSize) {
   } os(streambuf);
 
   testing::InSequence sequence;
-  const char *data = 0;
+  const char *data = nullptr;
   std::size_t size = max_size;
   do {
     typedef std::make_unsigned<std::streamsize>::type ustreamsize;
@@ -154,7 +154,7 @@ TEST(OStreamTest, WriteToOStreamMaxSize) {
     EXPECT_CALL(streambuf, xsputn(data, static_cast<std::streamsize>(n)))
         .WillOnce(testing::Return(max_streamsize));
     data += n;
-    size -= static_cast<std::size_t>(n);
+    size -= n;
   } while (size != 0);
   fmt::internal::write(os, buffer);
 }
diff --git a/test/posix-mock-test.cc b/test/posix-mock-test.cc
index f69313c3..83a9ac3c 100644
--- a/test/posix-mock-test.cc
+++ b/test/posix-mock-test.cc
@@ -6,7 +6,9 @@
 // For the license information refer to format.h.
 
 // Disable bogus MSVC warnings.
-#define _CRT_SECURE_NO_WARNINGS
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_WARNINGS
+#endif
 
 #include "posix-mock.h"
 #include "../src/posix.cc"
@@ -21,7 +23,7 @@
 # undef ERROR
 #endif
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 
@@ -131,7 +133,7 @@ int test::dup2(int fildes, int fildes2) {
 }
 
 FILE *test::fdopen(int fildes, const char *mode) {
-  EMULATE_EINTR(fdopen, 0);
+  EMULATE_EINTR(fdopen, nullptr);
   return ::FMT_POSIX(fdopen(fildes, mode));
 }
 
@@ -160,7 +162,7 @@ int test::pipe(int *pfds, unsigned psize, int textmode) {
 #endif
 
 FILE *test::fopen(const char *filename, const char *mode) {
-  EMULATE_EINTR(fopen, 0);
+  EMULATE_EINTR(fopen, nullptr);
   return ::fopen(filename, mode);
 }
 
@@ -193,7 +195,7 @@ int (test::fileno)(FILE *stream) {
 # define EXPECT_EQ_POSIX(expected, actual)
 #endif
 
-void write_file(fmt::cstring_view filename, fmt::string_view content) {
+static void write_file(fmt::cstring_view filename, fmt::string_view content) {
   fmt::buffered_file f(filename, "w");
   f.print("{}", content);
 }
@@ -214,7 +216,7 @@ TEST(UtilTest, GetPageSize) {
 
 TEST(FileTest, OpenRetry) {
   write_file("test", "there must be something here");
-  scoped_ptr<file> f;
+  scoped_ptr<file> f{nullptr};
   EXPECT_RETRY(f.reset(new file("test", file::RDONLY)),
                open, "cannot open file test");
 #ifndef _WIN32
@@ -230,7 +232,7 @@ TEST(FileTest, CloseNoRetryInDtor) {
   int saved_close_count = 0;
   EXPECT_WRITE(stderr, {
     close_count = 1;
-    f.reset();
+    f.reset(nullptr);
     saved_close_count = close_count;
     close_count = 0;
   }, format_system_error(EINTR, "cannot close file") + "\n");
@@ -383,7 +385,7 @@ TEST(FileTest, FdopenNoRetry) {
 
 TEST(BufferedFileTest, OpenRetry) {
   write_file("test", "there must be something here");
-  scoped_ptr<buffered_file> f;
+  scoped_ptr<buffered_file> f{nullptr};
   EXPECT_RETRY(f.reset(new buffered_file("test", "r")),
                fopen, "cannot open file test");
 #ifndef _WIN32
@@ -400,7 +402,7 @@ TEST(BufferedFileTest, CloseNoRetryInDtor) {
   int saved_fclose_count = 0;
   EXPECT_WRITE(stderr, {
     fclose_count = 1;
-    f.reset();
+    f.reset(nullptr);
     saved_fclose_count = fclose_count;
     fclose_count = 0;
   }, format_system_error(EINTR, "cannot close file") + "\n");
@@ -436,8 +438,9 @@ TEST(ScopedMock, Scope) {
     ScopedMock<TestMock> mock;
     EXPECT_EQ(&mock, TestMock::instance);
     TestMock &copy = mock;
+    static_cast<void>(copy);
   }
-  EXPECT_EQ(0, TestMock::instance);
+  EXPECT_EQ(nullptr, TestMock::instance);
 }
 
 #ifdef FMT_LOCALE
@@ -472,7 +475,13 @@ double _strtod_l(const char *nptr, char **endptr, _locale_t locale) {
 # pragma warning(pop)
 #endif
 
-LocaleType newlocale(int category_mask, const char *locale, LocaleType base) {
+#if defined(__THROW) && FMT_GCC_VERSION > 0 && FMT_GCC_VERSION <= 408
+#define FMT_LOCALE_THROW __THROW
+#else
+#define FMT_LOCALE_THROW
+#endif
+
+LocaleType newlocale(int category_mask, const char *locale, LocaleType base) FMT_LOCALE_THROW {
   return LocaleMock::instance->newlocale(category_mask, locale, base);
 }
 
@@ -482,15 +491,17 @@ typedef int FreeLocaleResult;
 typedef void FreeLocaleResult;
 #endif
 
-FreeLocaleResult freelocale(LocaleType locale) {
+FreeLocaleResult freelocale(LocaleType locale) FMT_LOCALE_THROW {
   LocaleMock::instance->freelocale(locale);
   return FreeLocaleResult();
 }
 
-double strtod_l(const char *nptr, char **endptr, LocaleType locale) {
+double strtod_l(const char *nptr, char **endptr, LocaleType locale) FMT_LOCALE_THROW {
   return LocaleMock::instance->strtod_l(nptr, endptr, locale);
 }
 
+#undef FMT_LOCALE_THROW
+
 TEST(LocaleTest, LocaleMock) {
   ScopedMock<LocaleMock> mock;
   LocaleType locale = reinterpret_cast<LocaleType>(11);
@@ -504,7 +515,7 @@ TEST(LocaleTest, Locale) {
 #endif
   ScopedMock<LocaleMock> mock;
   LocaleType impl = reinterpret_cast<LocaleType>(42);
-  EXPECT_CALL(mock, newlocale(LC_NUMERIC_MASK, StrEq("C"), 0))
+  EXPECT_CALL(mock, newlocale(LC_NUMERIC_MASK, StrEq("C"), nullptr))
       .WillOnce(Return(impl));
   EXPECT_CALL(mock, freelocale(impl));
   fmt::Locale locale;
diff --git a/test/posix-test.cc b/test/posix-test.cc
index aa0f0a50..f23d06b3 100644
--- a/test/posix-test.cc
+++ b/test/posix-test.cc
@@ -23,12 +23,12 @@ using fmt::file;
 using testing::internal::scoped_ptr;
 
 // Checks if the file is open by reading one character from it.
-bool isopen(int fd) {
+static bool isopen(int fd) {
   char buffer;
   return FMT_POSIX(read(fd, &buffer, 1)) == 1;
 }
 
-bool isclosed(int fd) {
+static bool isclosed(int fd) {
   char buffer;
   std::streamsize result = 0;
   SUPPRESS_ASSERT(result = FMT_POSIX(read(fd, &buffer, 1)));
@@ -36,7 +36,7 @@ bool isclosed(int fd) {
 }
 
 // Opens a file for reading.
-file open_file() {
+static file open_file() {
   file read_end, write_end;
   file::pipe(read_end, write_end);
   write_end.write(FILE_CONTENT, std::strlen(FILE_CONTENT));
@@ -45,7 +45,7 @@ file open_file() {
 }
 
 // Attempts to write a string to a file.
-void write(file &f, fmt::string_view s) {
+static void write(file &f, fmt::string_view s) {
   std::size_t num_chars_left = s.size();
   const char *ptr = s.data();
   do {
@@ -53,32 +53,32 @@ void write(file &f, fmt::string_view s) {
     ptr += count;
     // We can't write more than size_t bytes since num_chars_left
     // has type size_t.
-    num_chars_left -= static_cast<std::size_t>(count);
+    num_chars_left -= count;
   } while (num_chars_left != 0);
 }
 
 TEST(BufferedFileTest, DefaultCtor) {
   buffered_file f;
-  EXPECT_TRUE(f.get() == 0);
+  EXPECT_TRUE(f.get() == nullptr);
 }
 
 TEST(BufferedFileTest, MoveCtor) {
   buffered_file bf = open_buffered_file();
   FILE *fp = bf.get();
-  EXPECT_TRUE(fp != 0);
+  EXPECT_TRUE(fp != nullptr);
   buffered_file bf2(std::move(bf));
   EXPECT_EQ(fp, bf2.get());
-  EXPECT_TRUE(bf.get() == 0);
+  EXPECT_TRUE(bf.get() == nullptr);
 }
 
 TEST(BufferedFileTest, MoveAssignment) {
   buffered_file bf = open_buffered_file();
   FILE *fp = bf.get();
-  EXPECT_TRUE(fp != 0);
+  EXPECT_TRUE(fp != nullptr);
   buffered_file bf2;
   bf2 = std::move(bf);
   EXPECT_EQ(fp, bf2.get());
-  EXPECT_TRUE(bf.get() == 0);
+  EXPECT_TRUE(bf.get() == nullptr);
 }
 
 TEST(BufferedFileTest, MoveAssignmentClosesFile) {
@@ -90,13 +90,13 @@ TEST(BufferedFileTest, MoveAssignmentClosesFile) {
 }
 
 TEST(BufferedFileTest, MoveFromTemporaryInCtor) {
-  FILE *fp = 0;
+  FILE *fp = nullptr;
   buffered_file f(open_buffered_file(&fp));
   EXPECT_EQ(fp, f.get());
 }
 
 TEST(BufferedFileTest, MoveFromTemporaryInAssignment) {
-  FILE *fp = 0;
+  FILE *fp = nullptr;
   buffered_file f;
   f = open_buffered_file(&fp);
   EXPECT_EQ(fp, f.get());
@@ -126,7 +126,7 @@ TEST(BufferedFileTest, CloseErrorInDtor) {
       // output in EXPECT_STDERR and the second close will break output
       // redirection.
       FMT_POSIX(close(f->fileno()));
-      SUPPRESS_ASSERT(f.reset());
+      SUPPRESS_ASSERT(f.reset(nullptr));
   }, format_system_error(EBADF, "cannot close file") + "\n");
 }
 
@@ -134,7 +134,7 @@ TEST(BufferedFileTest, Close) {
   buffered_file f = open_buffered_file();
   int fd = f.fileno();
   f.close();
-  EXPECT_TRUE(f.get() == 0);
+  EXPECT_TRUE(f.get() == nullptr);
   EXPECT_TRUE(isclosed(fd));
 }
 
@@ -142,7 +142,7 @@ TEST(BufferedFileTest, CloseError) {
   buffered_file f = open_buffered_file();
   FMT_POSIX(close(f.fileno()));
   EXPECT_SYSTEM_ERROR_NOASSERT(f.close(), EBADF, "cannot close file");
-  EXPECT_TRUE(f.get() == 0);
+  EXPECT_TRUE(f.get() == nullptr);
 }
 
 TEST(BufferedFileTest, Fileno) {
@@ -153,7 +153,7 @@ TEST(BufferedFileTest, Fileno) {
   EXPECT_DEATH_IF_SUPPORTED({
     try {
       f.fileno();
-    } catch (fmt::system_error) {
+    } catch (const fmt::system_error&) {
       std::exit(1);
     }
   }, "");
@@ -209,7 +209,7 @@ TEST(FileTest, MoveAssignmentClosesFile) {
   EXPECT_TRUE(isclosed(old_fd));
 }
 
-file OpenBufferedFile(int &fd) {
+static file OpenBufferedFile(int &fd) {
   file f = open_file();
   fd = f.descriptor();
   return f;
@@ -253,7 +253,7 @@ TEST(FileTest, CloseErrorInDtor) {
       // output in EXPECT_STDERR and the second close will break output
       // redirection.
       FMT_POSIX(close(f->descriptor()));
-      SUPPRESS_ASSERT(f.reset());
+      SUPPRESS_ASSERT(f.reset(nullptr));
   }, format_system_error(EBADF, "cannot close file") + "\n");
 }
 
diff --git a/test/printf-test.cc b/test/printf-test.cc
index c15a3201..f9208c16 100644
--- a/test/printf-test.cc
+++ b/test/printf-test.cc
@@ -20,13 +20,13 @@ using fmt::format_error;
 const unsigned BIG_NUM = INT_MAX + 1u;
 
 // Makes format string argument positional.
-std::string make_positional(fmt::string_view format) {
+static std::string make_positional(fmt::string_view format) {
   std::string s(format.data(), format.size());
   s.replace(s.find('%'), 1, "%1$");
   return s;
 }
 
-std::wstring make_positional(fmt::wstring_view format) {
+static std::wstring make_positional(fmt::wstring_view format) {
   std::wstring s(format.data(), format.size());
   s.replace(s.find(L'%'), 1, L"%1$");
   return s;
@@ -410,7 +410,7 @@ TEST(PrintfTest, Inf) {
   double inf = std::numeric_limits<double>::infinity();
   for (const char* type = "fega"; *type; ++type) {
     EXPECT_PRINTF("inf", fmt::format("%{}", *type), inf);
-    char upper = std::toupper(*type);
+    char upper = static_cast<char>(std::toupper(*type));
     EXPECT_PRINTF("INF", fmt::format("%{}", upper), inf);
   }
 }
@@ -426,11 +426,11 @@ TEST(PrintfTest, Char) {
 
 TEST(PrintfTest, String) {
   EXPECT_PRINTF("abc", "%s", "abc");
-  const char *null_str = 0;
+  const char *null_str = nullptr;
   EXPECT_PRINTF("(null)", "%s", null_str);
   EXPECT_PRINTF("    (null)", "%10s", null_str);
   EXPECT_PRINTF(L"abc", L"%s", L"abc");
-  const wchar_t *null_wstr = 0;
+  const wchar_t *null_wstr = nullptr;
   EXPECT_PRINTF(L"(null)", L"%s", null_wstr);
   EXPECT_PRINTF(L"    (null)", L"%10s", null_wstr);
 }
@@ -439,22 +439,22 @@ TEST(PrintfTest, Pointer) {
   int n;
   void *p = &n;
   EXPECT_PRINTF(fmt::format("{}", p), "%p", p);
-  p = 0;
+  p = nullptr;
   EXPECT_PRINTF("(nil)", "%p", p);
   EXPECT_PRINTF("     (nil)", "%10p", p);
   const char *s = "test";
   EXPECT_PRINTF(fmt::format("{:p}", s), "%p", s);
-  const char *null_str = 0;
+  const char *null_str = nullptr;
   EXPECT_PRINTF("(nil)", "%p", null_str);
 
   p = &n;
   EXPECT_PRINTF(fmt::format(L"{}", p), L"%p", p);
-  p = 0;
+  p = nullptr;
   EXPECT_PRINTF(L"(nil)", L"%p", p);
   EXPECT_PRINTF(L"     (nil)", L"%10p", p);
   const wchar_t *w = L"test";
   EXPECT_PRINTF(fmt::format(L"{:p}", w), L"%p", w);
-  const wchar_t *null_wstr = 0;
+  const wchar_t *null_wstr = nullptr;
   EXPECT_PRINTF(L"(nil)", L"%p", null_wstr);
 }
 
diff --git a/test/ranges-test.cc b/test/ranges-test.cc
index c27833f2..1fab6ab4 100644
--- a/test/ranges-test.cc
+++ b/test/ranges-test.cc
@@ -11,7 +11,7 @@
 
 #include "fmt/ranges.h"
 
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 #include <vector>
 #include <array>
@@ -30,7 +30,6 @@ TEST(RangesTest, FormatVector2) {
   EXPECT_EQ("{{1, 2}, {3, 5}, {7, 11}}", ivf);
 }
 
-#if FMT_USE_INTEGER_SEQUENCE
 TEST(RangesTest, FormatMap) {
   std::map<std::string, int32_t> simap{{"one", 1}, {"two", 2}};
   EXPECT_EQ("{(one, 1), (two, 2)}", fmt::format("{}", simap));
@@ -87,4 +86,3 @@ TEST(RangesTest, FormatStruct) {
 
 #endif  // (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >
         // 201402L && _MSC_VER >= 1910)
-#endif  // FMT_USE_INTEGER_SEQUENCE
diff --git a/test/test-main.cc b/test/test-main.cc
index 2749a644..bc0be76a 100644
--- a/test/test-main.cc
+++ b/test/test-main.cc
@@ -6,7 +6,7 @@
 // For the license information refer to format.h.
 
 #include <cstdlib>
-#include <gtest/gtest.h>
+#include "gtest.h"
 
 #ifdef _WIN32
 # include <windows.h>
diff --git a/test/time-test.cc b/test/time-test.cc
index e285223b..bc05f24c 100644
--- a/test/time-test.cc
+++ b/test/time-test.cc
@@ -9,7 +9,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 #include "fmt/time.h"
 
 TEST(TimeTest, Format) {
@@ -26,7 +26,7 @@ TEST(TimeTest, GrowBuffer) {
   for (int i = 0; i < 30; ++i)
     s += "%c";
   s += "}\n";
-  std::time_t t = std::time(0);
+  std::time_t t = std::time(nullptr);
   fmt::format(s, *std::localtime(&t));
 }
 
@@ -34,7 +34,7 @@ TEST(TimeTest, EmptyResult) {
   EXPECT_EQ("", fmt::format("{}", std::tm()));
 }
 
-bool EqualTime(const std::tm &lhs, const std::tm &rhs) {
+static bool EqualTime(const std::tm &lhs, const std::tm &rhs) {
   return lhs.tm_sec == rhs.tm_sec &&
          lhs.tm_min == rhs.tm_min &&
          lhs.tm_hour == rhs.tm_hour &&
@@ -47,13 +47,13 @@ bool EqualTime(const std::tm &lhs, const std::tm &rhs) {
 }
 
 TEST(TimeTest, LocalTime) {
-  std::time_t t = std::time(0);
+  std::time_t t = std::time(nullptr);
   std::tm tm = *std::localtime(&t);
   EXPECT_TRUE(EqualTime(tm, fmt::localtime(t)));
 }
 
 TEST(TimeTest, GMTime) {
-  std::time_t t = std::time(0);
+  std::time_t t = std::time(nullptr);
   std::tm tm = *std::gmtime(&t);
   EXPECT_TRUE(EqualTime(tm, fmt::gmtime(t)));
 }
diff --git a/test/util-test.cc b/test/util-test.cc
index 5a0515d3..c4c7f44a 100644
--- a/test/util-test.cc
+++ b/test/util-test.cc
@@ -17,7 +17,7 @@
 # include <type_traits>
 #endif
 
-#include "gmock/gmock.h"
+#include "gmock.h"
 #include "gtest-extra.h"
 #include "mock-allocator.h"
 #include "util.h"
@@ -71,8 +71,8 @@ struct formatter<Test, Char> {
 };
 FMT_END_NAMESPACE
 
-void CheckForwarding(
-    MockAllocator<int> &alloc, AllocatorRef< MockAllocator<int> > &ref) {
+static void CheckForwarding(
+    MockAllocator<int> &alloc, AllocatorRef<MockAllocator<int>> &ref) {
   int mem;
   // Check if value_type is properly defined.
   AllocatorRef< MockAllocator<int> >::value_type *ptr = &mem;
@@ -92,7 +92,7 @@ TEST(AllocatorTest, AllocatorRef) {
   TestAllocatorRef ref2(ref);
   CheckForwarding(alloc, ref2);
   TestAllocatorRef ref3;
-  EXPECT_EQ(0, ref3.get());
+  EXPECT_EQ(nullptr, ref3.get());
   ref3 = ref;
   CheckForwarding(alloc, ref3);
 }
@@ -112,7 +112,7 @@ TEST(BufferTest, Nonmoveable) {
 // A test buffer with a dummy grow method.
 template <typename T>
 struct TestBuffer : basic_buffer<T> {
-  void grow(std::size_t capacity) { this->set(0, capacity); }
+  void grow(std::size_t capacity) { this->set(nullptr, capacity); }
 };
 
 template <typename T>
@@ -132,23 +132,23 @@ struct MockBuffer : basic_buffer<T> {
 TEST(BufferTest, Ctor) {
   {
     MockBuffer<int> buffer;
-    EXPECT_EQ(0, &buffer[0]);
-    EXPECT_EQ(0u, buffer.size());
-    EXPECT_EQ(0u, buffer.capacity());
+    EXPECT_EQ(nullptr, &buffer[0]);
+    EXPECT_EQ(static_cast<size_t>(0), buffer.size());
+    EXPECT_EQ(static_cast<size_t>(0), buffer.capacity());
   }
   {
     int dummy;
     MockBuffer<int> buffer(&dummy);
     EXPECT_EQ(&dummy, &buffer[0]);
-    EXPECT_EQ(0u, buffer.size());
-    EXPECT_EQ(0u, buffer.capacity());
+    EXPECT_EQ(static_cast<size_t>(0), buffer.size());
+    EXPECT_EQ(static_cast<size_t>(0), buffer.capacity());
   }
   {
     int dummy;
     std::size_t capacity = std::numeric_limits<std::size_t>::max();
     MockBuffer<int> buffer(&dummy, capacity);
     EXPECT_EQ(&dummy, &buffer[0]);
-    EXPECT_EQ(0u, buffer.size());
+    EXPECT_EQ(static_cast<size_t>(0), buffer.size());
     EXPECT_EQ(capacity, buffer.capacity());
   }
 }
@@ -201,7 +201,7 @@ TEST(BufferTest, Clear) {
   TestBuffer<char> buffer;
   buffer.resize(20);
   buffer.resize(0);
-  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(static_cast<size_t>(0), buffer.size());
   EXPECT_EQ(20u, buffer.capacity());
 }
 
@@ -231,7 +231,7 @@ TEST(BufferTest, AppendAllocatesEnoughStorage) {
 
 TEST(MemoryBufferTest, Ctor) {
   basic_memory_buffer<char, 123> buffer;
-  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(static_cast<size_t>(0), buffer.size());
   EXPECT_EQ(123u, buffer.capacity());
 }
 
@@ -239,7 +239,7 @@ TEST(MemoryBufferTest, Ctor) {
 
 typedef AllocatorRef< std::allocator<char> > TestAllocator;
 
-void check_move_buffer(const char *str,
+static void check_move_buffer(const char *str,
                        basic_memory_buffer<char, 5, TestAllocator> &buffer) {
   std::allocator<char> *alloc = buffer.get_allocator().get();
   basic_memory_buffer<char, 5, TestAllocator> buffer2(std::move(buffer));
@@ -248,7 +248,7 @@ void check_move_buffer(const char *str,
   EXPECT_EQ(str, std::string(&buffer2[0], buffer2.size()));
   EXPECT_EQ(5u, buffer2.capacity());
   // Move should transfer allocator.
-  EXPECT_EQ(0, buffer.get_allocator().get());
+  EXPECT_EQ(nullptr, buffer.get_allocator().get());
   EXPECT_EQ(alloc, buffer2.get_allocator().get());
 }
 
@@ -273,7 +273,7 @@ TEST(MemoryBufferTest, MoveCtor) {
   EXPECT_GT(buffer2.capacity(), 5u);
 }
 
-void check_move_assign_buffer(
+static void check_move_assign_buffer(
     const char *str, basic_memory_buffer<char, 5> &buffer) {
   basic_memory_buffer<char, 5> buffer2;
   buffer2 = std::move(buffer);
@@ -335,7 +335,7 @@ TEST(MemoryBufferTest, Grow) {
 TEST(MemoryBufferTest, Allocator) {
   typedef AllocatorRef< MockAllocator<char> > TestAllocator;
   basic_memory_buffer<char, 10, TestAllocator> buffer;
-  EXPECT_EQ(0, buffer.get_allocator().get());
+  EXPECT_EQ(nullptr, buffer.get_allocator().get());
   StrictMock< MockAllocator<char> > alloc;
   char mem;
   {
@@ -376,7 +376,7 @@ TEST(MemoryBufferTest, ExceptionInDeallocate) {
 TEST(FixedBufferTest, Ctor) {
   char array[10] = "garbage";
   fmt::basic_fixed_buffer<char> buffer(array, sizeof(array));
-  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(static_cast<size_t>(0), buffer.size());
   EXPECT_EQ(10u, buffer.capacity());
   EXPECT_EQ(array, buffer.data());
 }
@@ -384,7 +384,7 @@ TEST(FixedBufferTest, Ctor) {
 TEST(FixedBufferTest, CompileTimeSizeCtor) {
   char array[10] = "garbage";
   fmt::basic_fixed_buffer<char> buffer(array);
-  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(static_cast<size_t>(0), buffer.size());
   EXPECT_EQ(10u, buffer.capacity());
   EXPECT_EQ(array, buffer.data());
 }
@@ -402,7 +402,7 @@ struct uint32_pair {
 
 TEST(UtilTest, BitCast) {
   auto s = fmt::internal::bit_cast<uint32_pair>(uint64_t{42});
-  EXPECT_EQ(fmt::internal::bit_cast<uint64_t>(s), 42u);
+  EXPECT_EQ(fmt::internal::bit_cast<uint64_t>(s), 42ull);
   s = fmt::internal::bit_cast<uint32_pair>(uint64_t(~0ull));
   EXPECT_EQ(fmt::internal::bit_cast<uint64_t>(s), ~0ull);
 }
@@ -439,7 +439,7 @@ struct custom_context {
 
       const char *format(const T &, custom_context& ctx) {
         ctx.called = true;
-        return 0;
+        return nullptr;
       }
     };
   };
@@ -583,8 +583,8 @@ TEST(UtilTest, WStringArg) {
 }
 
 TEST(UtilTest, PointerArg) {
-  void *p = 0;
-  const void *cp = 0;
+  void *p = nullptr;
+  const void *cp = nullptr;
   CHECK_ARG_(char, cp, p);
   CHECK_ARG_(wchar_t, cp, p);
   CHECK_ARG(cp, );
@@ -765,14 +765,14 @@ TEST(UtilTest, FormatSystemError) {
   try {
     std::allocator<char> alloc;
     alloc.deallocate(alloc.allocate(max_size), max_size);
-  } catch (std::bad_alloc) {
+  } catch (const std::bad_alloc&) {
     throws_on_alloc = true;
   }
   if (!throws_on_alloc) {
     fmt::print("warning: std::allocator allocates {} chars", max_size);
     return;
   }
-  fmt::format_system_error(message, EDOM, fmt::string_view(0, max_size));
+  fmt::format_system_error(message, EDOM, fmt::string_view(nullptr, max_size));
   EXPECT_EQ(fmt::format("error {}", EDOM), to_string(message));
 }
 
@@ -822,7 +822,8 @@ TEST(UtilTest, FormatLongWindowsError) {
   const int provisioning_not_allowed = 0x80284013L /*TBS_E_PROVISIONING_NOT_ALLOWED*/;
   if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
       FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0,
-      provisioning_not_allowed, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+      static_cast<DWORD>(provisioning_not_allowed),
+      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
       reinterpret_cast<LPWSTR>(&message), 0, 0) == 0) {
     return;
   }
@@ -867,7 +868,7 @@ TEST(UtilTest, IsEnumConvertibleToInt) {
 #endif
 
 TEST(UtilTest, ParseNonnegativeInt) {
-  if (std::numeric_limits<int>::max() != (1 << 31)) {
+  if (std::numeric_limits<int>::max() != static_cast<int>(static_cast<unsigned>(1) << 31)) {
     fmt::print("Skipping parse_nonnegative_int test\n");
     return;
   }
diff --git a/test/util.h b/test/util.h
index a4440bb0..c0af03c7 100644
--- a/test/util.h
+++ b/test/util.h
@@ -35,7 +35,7 @@ std::string get_system_error(int error_code);
 extern const char *const FILE_CONTENT;
 
 // Opens a buffered file for reading.
-fmt::buffered_file open_buffered_file(FILE **fp = 0);
+fmt::buffered_file open_buffered_file(FILE **fp = nullptr);
 
 inline FILE *safe_fopen(const char *filename, const char *mode) {
 #if defined(_WIN32) && !defined(__MINGW32__)