diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
index 49953fd7..4f65eb4b 100644
--- a/include/fmt/ranges.h
+++ b/include/fmt/ranges.h
@@ -219,9 +219,8 @@ template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
   static decltype(check2(
       index_sequence<I...>{},
       integer_sequence<
-          bool, (fmt::is_formattable<typename std::tuple_element<I, T>::type,
-                                     C>::value)...>{}))
-      check(index_sequence<I...>);
+          bool, (is_formattable<typename std::tuple_element<I, T>::type,
+                                C>::value)...>{})) check(index_sequence<I...>);
 
  public:
   static constexpr const bool value =
diff --git a/test/ranges-test.cc b/test/ranges-test.cc
index ce6dc512..468e4f40 100644
--- a/test/ranges-test.cc
+++ b/test/ranges-test.cc
@@ -85,23 +85,22 @@ TEST(ranges_test, format_pair) {
   EXPECT_EQ(fmt::format("{}", p), "(42, 1.5)");
 }
 
+struct unformattable {};
+
 TEST(ranges_test, format_tuple) {
   auto t =
       std::tuple<int, float, std::string, char>(42, 1.5f, "this is tuple", 'i');
   EXPECT_EQ(fmt::format("{}", t), "(42, 1.5, \"this is tuple\", 'i')");
   EXPECT_EQ(fmt::format("{}", std::tuple<>()), "()");
 
-  enum class noformatenum{b};
-  struct noformatstruct{};
   EXPECT_TRUE((fmt::is_formattable<std::tuple<>>::value));
-  EXPECT_FALSE((fmt::is_formattable<noformatenum>::value));
-  EXPECT_FALSE((fmt::is_formattable<noformatstruct>::value));
-  EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatenum>>::value));
-  EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct>>::value));
-  EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct,int>>::value));
-  EXPECT_FALSE((fmt::is_formattable<std::tuple<int,noformatenum>>::value));
-  EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct,noformatenum>>::value));
-  EXPECT_TRUE((fmt::is_formattable<std::tuple<int,float>>::value));
+  EXPECT_FALSE((fmt::is_formattable<unformattable>::value));
+  EXPECT_FALSE((fmt::is_formattable<std::tuple<unformattable>>::value));
+  EXPECT_FALSE((fmt::is_formattable<std::tuple<unformattable, int>>::value));
+  EXPECT_FALSE((fmt::is_formattable<std::tuple<int, unformattable>>::value));
+  EXPECT_FALSE(
+      (fmt::is_formattable<std::tuple<unformattable, unformattable>>::value));
+  EXPECT_TRUE((fmt::is_formattable<std::tuple<int, float>>::value));
 }
 
 #ifdef FMT_RANGES_TEST_ENABLE_FORMAT_STRUCT
@@ -232,7 +231,6 @@ TEST(ranges_test, enum_range) {
 }
 
 #if !FMT_MSC_VERSION
-struct unformattable {};
 
 TEST(ranges_test, unformattable_range) {
   EXPECT_FALSE((fmt::has_formatter<std::vector<unformattable>,