diff --git a/tests/extensions.cpp b/tests/extensions.cpp
index e116a61..9eb024a 100644
--- a/tests/extensions.cpp
+++ b/tests/extensions.cpp
@@ -133,7 +133,7 @@ TEST_CASE("Monadic operations", "[monadic]") {
   }
 
   SECTION("map constexpr") {
-#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) && !defined(TL_OPTIONAL_GCC55)
+#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14)
     // test each overload in turn
     constexpr tl::optional<int> o16 = 42;
     constexpr auto o16r = o16.map(get_int);
@@ -248,7 +248,7 @@ TEST_CASE("Monadic operations", "[monadic]") {
   }
 
   SECTION("constexpr and_then") {
-#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14) && !defined(TL_OPTIONAL_GCC55)
+#if !defined(_MSC_VER) && defined(TL_OPTIONAL_CXX14)
 
     constexpr tl::optional<int> o10 = 42;
     constexpr auto o10r = o10.and_then(get_opt_int);
diff --git a/tl/optional.hpp b/tl/optional.hpp
index 75e28c3..7c12ad5 100644
--- a/tl/optional.hpp
+++ b/tl/optional.hpp
@@ -38,7 +38,7 @@
 #define TL_OPTIONAL_GCC54
 #endif
 
-#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 &&              \
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 &&              \
      !defined(__clang__))
 #define TL_OPTIONAL_GCC55
 #endif