diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 1450095af..9f7a72a4b 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -1905,6 +1905,7 @@ BOOST_AUTO_TEST_CASE(use_std_lib)
 		import "mortal";
 		contract Icarus is mortal { }
 	)";
+	m_addStandardSources = true;
 	u256 amount(130);
 	u160 address(23);
 	compileAndRun(sourceCode, amount, "Icarus");
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h
index 208e9ae80..7dad9ad44 100644
--- a/solidityExecutionFramework.h
+++ b/solidityExecutionFramework.h
@@ -45,8 +45,7 @@ public:
 
 	bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
 	{
-		// add standard sources only if contract name is given
-		dev::solidity::CompilerStack compiler(!_contractName.empty());
+		dev::solidity::CompilerStack compiler(m_addStandardSources);
 		try
 		{
 			compiler.addSource("", _sourceCode);
@@ -175,6 +174,7 @@ private:
 
 protected:
 	bool m_optimize = false;
+	bool m_addStandardSources = false;
 	Address m_sender;
 	Address m_contractAddress;
 	eth::State m_state;