diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index cc5561daf..8c0a45308 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -356,13 +356,13 @@ string dev::eth::disassemble(bytes const& _mem)
 	stringstream ret;
 	eachInstruction(_mem, [&](Instruction _instr, u256 const& _data) {
 		if (!isValidInstruction(_instr))
-			ret << "0x" << hex << int(_instr) << " ";
+			ret << "0x" << std::uppercase << std::hex << int(_instr) << " ";
 		else
 		{
 			InstructionInfo info = instructionInfo(_instr);
 			ret << info.name << " ";
 			if (info.additional)
-				ret << "0x" << hex << _data << " ";
+				ret << "0x" << std::uppercase << std::hex << _data << " ";
 		}
 	});
 	return ret.str();
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 79d85d82f..5a5ca258c 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -294,7 +294,7 @@ void CommandLineInterface::handleOpcode(string const& _contract)
 	else
 	{
 		sout() << "Opcodes: " << endl;
-		sout() << dev::eth::disassemble(m_compiler->object(_contract).bytecode);
+		sout() << std::uppercase << dev::eth::disassemble(m_compiler->object(_contract).bytecode);
 		sout() << endl;
 	}
 }
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 8e0eebcaa..390c5bf05 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -52,7 +52,7 @@ void InterpreterState::dumpTraceAndState(ostream& _out) const
 		words[(offset / 0x20) * 0x20] |= u256(uint32_t(value)) << (256 - 8 - 8 * size_t(offset % 0x20));
 	for (auto const& [offset, value]: words)
 		if (value != 0)
-			_out << "  " << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
+			_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
 	_out << "Storage dump:" << endl;
 	for (auto const& slot: storage)
 		if (slot.second != h256(0))