diff --git a/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st b/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st
index 99020a6..86baeb3 100644
--- a/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st
+++ b/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st
@@ -303,7 +303,7 @@ AeCanvasTest >> renderEmoji [
 	| fontHeight aeCanvas cairoScaledFont cairoGlyphsArray |
 
 	self skip. "Randomly fails. We suspect we need a more recent version of cairo (it introduced improvements in this area)."
-	
+
 	fontHeight := 25.
 	aeCanvas := AeCanvas extent: fontHeight * 1.3 asPoint.
 	aeCanvas clear: Color paleYellow.
@@ -388,8 +388,6 @@ AeCanvasTest >> renderLigatureTextWithHarfbuzz [
 	"Test Harfbuzz converting a 'ff' pair of letters into a single glyph."
 
 	| aString fontSize aeCanvas cairoScaledFont cairoGlyphsArray |
-	self skip.
-	
 	aString := 'Office'.
 	fontSize := 19.
 	aeCanvas := AeCanvas extent: 50 @ 25.
@@ -480,8 +478,9 @@ AeCanvasTest >> renderOpenFigure [
 AeCanvasTest >> renderZWJEmojiWithHarfbuzz [
 
 	| fontHeight aeCanvas cairoScaledFont cairoGlyphsArray |
+
 	self skip. "Randomly fails. We suspect we need a more recent version of cairo (it introduced improvements in this area)."
-	
+
 	fontHeight := 24.
 	aeCanvas := AeCanvas extent: 200 @ (fontHeight * 2).
 	aeCanvas clear: Color white.
@@ -514,6 +513,7 @@ AeCanvasTest >> renderZWJEmojiWithHarfbuzz [
 AeCanvasTest >> renderZWJEmojiWithoutHarfbuzz [
 
 	| fontHeight aeCanvas cairoScaledFont cairoGlyphsArray |
+
 	self skip. "Randomly fails. We suspect we need a more recent version of cairo (it introduced improvements in this area)."
 
 	fontHeight := 21.
diff --git a/src/Alexandrie-FreeType-Tests/AeFTLibraryResource.class.st b/src/Alexandrie-FreeType-Tests/AeFTLibraryResource.class.st
index 78f3445..48e0fe5 100644
--- a/src/Alexandrie-FreeType-Tests/AeFTLibraryResource.class.st
+++ b/src/Alexandrie-FreeType-Tests/AeFTLibraryResource.class.st
@@ -13,6 +13,20 @@ Class {
 	#category : #'Alexandrie-FreeType-Tests-Resource'
 }
 
+{ #category : #'class initialization' }
+AeFTLibraryResource class >> initialize [
+
+	SessionManager default registerUserClassNamed: self name
+]
+
+{ #category : #'system startup' }
+AeFTLibraryResource class >> startUp: isImageStarting [
+	"Pharo is starting up. If this platform requires specific initialization, this is a great place to put it."
+
+	super startUp: isImageStarting.
+	isImageStarting ifTrue: [ self reset ]
+]
+
 { #category : #accessing }
 AeFTLibraryResource >> emojiFTFace [
 
diff --git a/tests/canvas/renderLigatureTextWithHarfbuzz.png b/tests/canvas/renderLigatureTextWithHarfbuzz.png
index b214c04..4ab1388 100644
Binary files a/tests/canvas/renderLigatureTextWithHarfbuzz.png and b/tests/canvas/renderLigatureTextWithHarfbuzz.png differ
diff --git a/tests/canvas/renderZWJEmojiWithHarfbuzz.png b/tests/canvas/renderZWJEmojiWithHarfbuzz.png
new file mode 100644
index 0000000..4c3b867
Binary files /dev/null and b/tests/canvas/renderZWJEmojiWithHarfbuzz.png differ