diff --git a/fmt/time.h b/fmt/time.h
index ec0b775e..e20b2b48 100644
--- a/fmt/time.h
+++ b/fmt/time.h
@@ -37,7 +37,7 @@ void format(BasicFormatter<char, ArgFormatter> &f,
       break;
     }
     const std::size_t MIN_GROWTH = 10;
-    buffer.reserve(buffer.capacity() + size > MIN_GROWTH ? size : MIN_GROWTH);
+    buffer.reserve(buffer.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH));
   }
   format_str = end + 1;
 }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 96f874e7..86e72b97 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -86,6 +86,7 @@ add_fmt_test(format-impl-test)
 add_fmt_test(ostream-test)
 add_fmt_test(printf-test)
 add_fmt_test(string-test)
+add_fmt_test(time-test)
 add_fmt_test(util-test mock-allocator.h)
 add_fmt_test(macro-test)
 add_fmt_test(custom-formatter-test)
diff --git a/test/format-test.cc b/test/format-test.cc
index da9e57a8..6eb7e2a7 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -60,7 +60,6 @@ lconv *localeconv() {
 }
 
 #include "fmt/format.h"
-#include "fmt/time.h"
 
 #include "util.h"
 #include "mock-allocator.h"
@@ -1551,15 +1550,6 @@ TEST(FormatTest, Variadic) {
   EXPECT_EQ(L"abc1", format(L"{}c{}", L"ab", 1));
 }
 
-TEST(FormatTest, Time) {
-  std::tm tm = std::tm();
-  tm.tm_year = 116;
-  tm.tm_mon  = 3;
-  tm.tm_mday = 25;
-  EXPECT_EQ("The date is 2016-04-25.",
-            fmt::format("The date is {:%Y-%m-%d}.", tm));
-}
-
 template <typename T>
 std::string str(const T &value) {
   return fmt::format("{}", value);
diff --git a/test/time-test.cc b/test/time-test.cc
new file mode 100644
index 00000000..f595090e
--- /dev/null
+++ b/test/time-test.cc
@@ -0,0 +1,29 @@
+/*
+ Time formatting tests
+
+ Copyright (c) 2012 - 2016, Victor Zverovich
+ All rights reserved.
+
+ For the license information refer to format.h.
+ */
+
+#include "gmock/gmock.h"
+#include "fmt/time.h"
+
+TEST(TimeTest, Format) {
+  std::tm tm = std::tm();
+  tm.tm_year = 116;
+  tm.tm_mon  = 3;
+  tm.tm_mday = 25;
+  EXPECT_EQ("The date is 2016-04-25.",
+            fmt::format("The date is {:%Y-%m-%d}.", tm));
+}
+
+TEST(TimeTest, GrowBuffer) {
+  std::string s = "{:";
+  for (int i = 0; i < 30; ++i)
+    s += "%c";
+  s += "}\n";
+  std::time_t t = std::time(0);
+  fmt::format(s, *std::localtime(&t));
+}