diff --git a/include/turtle/matcher.hpp b/include/turtle/matcher.hpp
index fc20a22..3bd9923 100644
--- a/include/turtle/matcher.hpp
+++ b/include/turtle/matcher.hpp
@@ -41,7 +41,7 @@ public:
     explicit matcher(const char* expected) : expected_(expected) {}
     bool operator()(const char* actual)
     {
-        if (nullptr == actual || nullptr == expected_)
+        if(!actual || !expected_)
             return actual == expected_;
         return std::strcmp(actual, expected_) == 0;
     }
diff --git a/include/turtle/stream.hpp b/include/turtle/stream.hpp
index e3bf273..979e6a7 100644
--- a/include/turtle/stream.hpp
+++ b/include/turtle/stream.hpp
@@ -108,7 +108,7 @@ namespace detail {
     }
     inline void serialize(stream& s, const char* const str)
     {
-        if (nullptr != str)
+        if(str)
             s << '"' << str << '"';
         else
             s << "nullptr";
diff --git a/test/test_log.cpp b/test/test_log.cpp
index 4c321fe..94db5c4 100644
--- a/test/test_log.cpp
+++ b/test/test_log.cpp
@@ -93,8 +93,7 @@ BOOST_AUTO_TEST_CASE(null_c_strings_are_serialized_to_nullptr)
 {
     const char* const null_str = nullptr;
     BOOST_CHECK_EQUAL("nullptr", to_string(null_str));
-    // Note the lack of double quotes in the output, as opposed to when the
-    // string "nullptr" is serialized.
+    BOOST_CHECK_EQUAL("\"nullptr\"", to_string("nullptr"));
 }
 
 namespace {
diff --git a/test/test_matcher.cpp b/test/test_matcher.cpp
index f7292b8..547ecaa 100644
--- a/test/test_matcher.cpp
+++ b/test/test_matcher.cpp
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE(ref_to_int_and_int_can_be_compared)
 namespace {
 struct fixture
 {
-    fixture() : text("same text"), actual(text.c_str()), null_str(nullptr)
+    fixture() : text("same text"), actual(text.c_str())
     {
         const char* static_string = "same text";
         BOOST_REQUIRE(actual != static_string);
@@ -44,7 +44,6 @@ struct fixture
     }
     std::string text;
     const char* actual;
-    const char* null_str;
 };
 } // namespace
 
@@ -76,8 +75,9 @@ BOOST_FIXTURE_TEST_CASE(const_char_pointer_and_std_string_can_be_compared, fixtu
     BOOST_CHECK(!match(std::string("different text"), actual));
 }
 
-BOOST_FIXTURE_TEST_CASE(null_const_char_pointers_can_be_compared, fixture)
+BOOST_AUTO_TEST_CASE(null_const_char_pointers_can_be_compared)
 {
+    const char* const null_str = nullptr;
     BOOST_CHECK(match(null_str, null_str));
     BOOST_CHECK(!match(null_str, "non-null string"));
     BOOST_CHECK(!match("non-null string", null_str));