diff --git a/test/core-test.cc b/test/core-test.cc
index 66475b03..fed78c3b 100644
--- a/test/core-test.cc
+++ b/test/core-test.cc
@@ -397,8 +397,7 @@ TEST(ArgTest, CustomArg) {
 }
 
 TEST(ArgTest, VisitInvalidArg) {
-  typedef mock_visitor<fmt::monostate> Visitor;
-  testing::StrictMock<Visitor> visitor;
+  testing::StrictMock< mock_visitor<fmt::monostate> > visitor;
   EXPECT_CALL(visitor, visit(_));
   fmt::basic_format_arg<fmt::format_context> arg;
   visit(visitor, arg);
@@ -446,7 +445,7 @@ TEST(CoreTest, ConvertToInt) {
   EXPECT_TRUE((fmt::convert_to_int<basic_enum, char>::value));
 }
 
-enum enum_with_underlying_type : char {TestValue};
+enum enum_with_underlying_type : char {};
 
 TEST(CoreTest, IsEnumConvertibleToInt) {
   EXPECT_TRUE((fmt::convert_to_int<enum_with_underlying_type, char>::value));
diff --git a/test/folly/Range.h b/test/folly/Range.h
deleted file mode 100644
index f794019f..00000000
--- a/test/folly/Range.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// A folly::StringPiece stub.
-
-#include <cstring>
-
-namespace folly {
-class StringPiece {
- public:
-  explicit StringPiece(const char *s) : data_(s), size_(std::strlen(s)) {}
-
-  const char* data() const { return "foo"; }
-  size_t size() const { return 3; }
-
- private:
-  const char *data_;
-  size_t size_;
-};
-}