diff --git a/python/GafferCyclesTest/IECoreCyclesPreviewTest/RendererTest.py b/python/GafferCyclesTest/IECoreCyclesPreviewTest/RendererTest.py
index 826695552c7..3bfcce70402 100644
--- a/python/GafferCyclesTest/IECoreCyclesPreviewTest/RendererTest.py
+++ b/python/GafferCyclesTest/IECoreCyclesPreviewTest/RendererTest.py
@@ -1818,8 +1818,8 @@ def testUnsupportedShaderParameters( self ) :
 		self.assertEqual( len( mh.messages ), 1 )
 		self.assertEqual( mh.messages[0].context, "Cycles::SocketAlgo" )
 		self.assertEqual( mh.messages[0].level, IECore.Msg.Level.Warning )
-		six.assertRegex(
-			self, mh.messages[0].message,
+		self.assertRegex(
+			mh.messages[0].message,
 			"Unsupported socket type `transform` for socket `ob_tfm` on node .*"
 		)
 
diff --git a/src/GafferCycles/IECoreCyclesPreview/SocketAlgo.cpp b/src/GafferCycles/IECoreCyclesPreview/SocketAlgo.cpp
index 2a4c7f32757..7b583fee7f8 100644
--- a/src/GafferCycles/IECoreCyclesPreview/SocketAlgo.cpp
+++ b/src/GafferCycles/IECoreCyclesPreview/SocketAlgo.cpp
@@ -46,6 +46,8 @@ IECORE_PUSH_DEFAULT_VISIBILITY
 #include "util/vector.h"
 IECORE_POP_DEFAULT_VISIBILITY
 
+#include "fmt/format.h"
+
 using namespace std;
 using namespace Imath;
 using namespace IECore;
@@ -448,8 +450,10 @@ void setSocket( ccl::Node *node, const ccl::SocketType *socket, const IECore::Da
 		default:
 			IECore::msg(
 				IECore::Msg::Warning, "Cycles::SocketAlgo",
-				boost::format( "Unsupported socket type `%1%` for socket `%2%` on node `%3%`." )
-					% ccl::SocketType::type_name( socket->type ) % socket->name % node->name
+				fmt::format(
+					"Unsupported socket type `{}` for socket `{}` on node `{}`.",
+					ccl::SocketType::type_name( socket->type ), socket->name, node->name
+				)
 			);
 			break;
 	}