diff --git a/TODO.txt b/TODO.txt
index 348b480d..3ab4132c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,4 @@
 Sanitize
-    Remove deserialization test error fixture
     Change text row to use parameterized tests
 	See if we have any trouble with user input in binary serialization: make assertions
 	Test with an unknown protocol type
diff --git a/test/unit/detail/protocol/serialization_test_common.cpp b/test/unit/detail/protocol/serialization_test_common.cpp
index 8a12bf43..5ca98cf8 100644
--- a/test/unit/detail/protocol/serialization_test_common.cpp
+++ b/test/unit/detail/protocol/serialization_test_common.cpp
@@ -124,19 +124,5 @@ TEST_P(FullSerializationTest, deserialize) { deserialize_test(GetParam()); }
 TEST_P(FullSerializationTest, deserialize_extra_space) { deserialize_extra_space_test(GetParam()); }
 TEST_P(FullSerializationTest, deserialize_not_enough_space) { deserialize_not_enough_space_test(GetParam()); }
 
-// Errc tests
-TEST_P(DeserializeErrorTest, Deserialize_ErrorCondition_ReturnsErrorCode)
-{
-    auto first = GetParam().buffer.data();
-    auto last = GetParam().buffer.data() + GetParam().buffer.size();
-    deserialization_context ctx (first, last, capabilities());
-    auto value = GetParam().value->default_construct();
-    auto err = value->deserialize(ctx);
-    EXPECT_EQ(err, GetParam().expected_error);
-}
-
 } // anon namespace
 
-
-
-
diff --git a/test/unit/detail/protocol/serialization_test_common.hpp b/test/unit/detail/protocol/serialization_test_common.hpp
index 05607503..2ed19d30 100644
--- a/test/unit/detail/protocol/serialization_test_common.hpp
+++ b/test/unit/detail/protocol/serialization_test_common.hpp
@@ -183,30 +183,6 @@ struct DeserializeSpaceTest : SerializationFixture {}; // Deserialization + extr
 struct SerializeDeserializeTest : SerializationFixture {}; // Serialization + deserialization
 struct FullSerializationTest : SerializationFixture {}; // All
 
-// errc tests
-struct deserialize_error_testcase : test::named_param
-{
-    std::shared_ptr<any_value> value;
-    std::vector<uint8_t> buffer;
-    std::string name;
-    errc expected_error;
-
-    template <typename T>
-    deserialize_error_testcase(
-        std::vector<uint8_t>&& buffer,
-        std::string&& test_name,
-        errc err = errc::incomplete_message
-    ) :
-        value(std::make_shared<any_value_impl<T>>(T{})),
-        buffer(std::move(buffer)),
-        name(std::move(test_name)),
-        expected_error(err)
-    {
-    }
-};
-
-struct DeserializeErrorTest : testing::TestWithParam<deserialize_error_testcase> {};
-
 } // test
 } // mysql
 } // boost