diff --git a/README.md b/README.md
index e037dab..c0b6dfc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![Pharo 11](https://img.shields.io/badge/Pharo-11-%23aac9ff.svg)](https://pharo.org/download)
 [![Pharo 12](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download)
 [![Pharo 13](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download)
+[![Pharo 14](https://img.shields.io/badge/Pharo-14-%23aac9ff.svg)](https://pharo.org/download)
 
 [![License](https://img.shields.io/github/license/OpenSmock/Molecule.svg)](./LICENSE)
 [![Unit tests](https://github.com/OpenSmock/Molecule/actions/workflows/CI.yml/badge.svg)](https://github.com/OpenSmock/Molecule/actions/workflows/CI.yml)
diff --git a/src/Molecule-Tests/MolComponentFactoryTest.class.st b/src/Molecule-Tests/MolComponentFactoryTest.class.st
index e1c10c5..983399a 100644
--- a/src/Molecule-Tests/MolComponentFactoryTest.class.st
+++ b/src/Molecule-Tests/MolComponentFactoryTest.class.st
@@ -32,8 +32,12 @@ MolComponentFactoryTest >> cleanGeneratedClassesAndTraits [
 MolComponentFactoryTest >> cleanGeneratedMethods [
 	"Restore methods added by tests"
 	
-	MolCompleteSubComponentOverloadImpl class removeSelector: #usedComponentServices.
-	MolCompleteSubComponentOverloadImpl class removeSelector: #providedComponentServices
+	(MolCompleteSubComponentOverloadImpl class includesLocalSelector: #usedComponentServices) ifTrue:[
+		MolCompleteSubComponentOverloadImpl class removeSelector: #usedComponentServices.
+	].
+	(MolCompleteSubComponentOverloadImpl class includesLocalSelector: #providedComponentServices) ifTrue:[
+		MolCompleteSubComponentOverloadImpl class removeSelector: #providedComponentServices
+	].
 ]
 
 { #category : #utilities }