diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 1450095af..5f1a0993c 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -916,7 +916,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors)
 	BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina"));
 	BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(toBigEndian(u256(123)))));
 	BOOST_CHECK(callContractFunction("an_address()") == encodeArgs(toBigEndian(u160(0x1337))));
-	BOOST_CHECK(!(callContractFunction("super_secret_data()") == encodeArgs(42)));
+	BOOST_CHECK(callContractFunction("super_secret_data()") == bytes());
 }
 
 BOOST_AUTO_TEST_CASE(balance)
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp
index 979836ecc..5ae854bc0 100644
--- a/SolidityNameAndTypeResolution.cpp
+++ b/SolidityNameAndTypeResolution.cpp
@@ -644,7 +644,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 	BOOST_CHECK_NO_THROW(source = parseTextAndResolveNamesWithChecks(text));
 	BOOST_REQUIRE((contract = retrieveContract(source, 0)) != nullptr);
 	FunctionDescription function = retrieveFunctionBySignature(contract, "foo()");
-	BOOST_CHECK_MESSAGE(function.getDeclaration() != nullptr, "Could not find the accessor function");
+	BOOST_REQUIRE(function.getDeclaration() != nullptr);
 	auto returnParams = function.getReturnParameters();
 	BOOST_CHECK_EQUAL(returnParams.at(0).getType(), "uint256");
 	BOOST_CHECK(function.isConstant());