diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 948c79dee..f55239e60 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -57,7 +57,7 @@ get_logfile_basename() {
 BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml"
 SOLTEST_ARGS="--evm-version=$EVM $SOLTEST_FLAGS"
 test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize"
-test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2 --optimize-yul"
+test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2"
 
 echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS} -- ${SOLTEST_ARGS}"
 
diff --git a/scripts/tests.sh b/scripts/tests.sh
index c0601a12d..00b4a1641 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -100,7 +100,7 @@ do
             force_abiv2_flag=""
             if [[ "$abiv2" == "yes" ]]
             then
-                force_abiv2_flag="--abiencoderv2 --optimize-yul"
+                force_abiv2_flag="--abiencoderv2"
             fi
             printTask "--> Running tests using "$optimize" --evm-version "$vm" $force_abiv2_flag..."
 
diff --git a/test/Common.cpp b/test/Common.cpp
index b65555ba1..69bfd21ee 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -94,7 +94,6 @@ CommonOptions::CommonOptions(std::string _caption):
 		("evmonepath", po::value<fs::path>(&evmonePath)->default_value(EVMOneEnvOrDefaultPath()), "path to evmone library")
 		("no-smt", po::bool_switch(&disableSMT), "disable SMT checker")
 		("optimize", po::bool_switch(&optimize), "enables optimization")
-		("optimize-yul", po::bool_switch(&optimizeYul), "enables Yul optimization")
 		("enforce-via-yul", po::bool_switch(&enforceViaYul), "Enforce compiling all tests via yul to see if additional tests can be activated.")
 		("abiencoderv2", po::bool_switch(&useABIEncoderV2), "enables abi encoder v2")
 		("show-messages", po::bool_switch(&showMessages), "enables message output")
diff --git a/test/Common.h b/test/Common.h
index 128d23ee5..119050f39 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -46,7 +46,6 @@ struct CommonOptions: boost::noncopyable
 	boost::filesystem::path evmonePath;
 	boost::filesystem::path testPath;
 	bool optimize = false;
-	bool optimizeYul = false;
 	bool enforceViaYul = false;
 	bool disableSMT = false;
 	bool useABIEncoderV2 = false;
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 170f5638c..ab11b2e98 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -49,9 +49,7 @@ ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion):
 	m_showMessages(solidity::test::CommonOptions::get().showMessages),
 	m_evmHost(make_shared<EVMHost>(m_evmVersion))
 {
-	if (solidity::test::CommonOptions::get().optimizeYul)
-		m_optimiserSettings = solidity::frontend::OptimiserSettings::full();
-	else if (solidity::test::CommonOptions::get().optimize)
+	if (solidity::test::CommonOptions::get().optimize)
 		m_optimiserSettings = solidity::frontend::OptimiserSettings::standard();
 
 	reset();
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index 1fa0bf712..252b7759b 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 	// This is only correct on >=Constantinople.
 	else if (CommonOptions::get().useABIEncoderV2)
 	{
-		if (CommonOptions::get().optimizeYul)
+		if (CommonOptions::get().optimize)
 		{
 			// Costs with 0 are cases which cannot be triggered in tests.
 			if (evmVersion < EVMVersion::istanbul())
@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		// This is only correct on >=Constantinople.
 		else if (CommonOptions::get().useABIEncoderV2)
 		{
-			if (CommonOptions::get().optimizeYul)
+			if (CommonOptions::get().optimize)
 			{
 				if (evmVersion < EVMVersion::istanbul())
 					CHECK_GAS(0, 21567, 20);