diff --git a/org.eclipse.xtext.web/src/test/xtext-gen/org/eclipse/xtext/web/example/statemachine/tests/StatemachineInjectorProvider.java b/org.eclipse.xtext.web/src/test/xtext-gen/org/eclipse/xtext/web/example/statemachine/tests/StatemachineInjectorProvider.java
index 7ff2b82f4c9..7d63dbd66f2 100644
--- a/org.eclipse.xtext.web/src/test/xtext-gen/org/eclipse/xtext/web/example/statemachine/tests/StatemachineInjectorProvider.java
+++ b/org.eclipse.xtext.web/src/test/xtext-gen/org/eclipse/xtext/web/example/statemachine/tests/StatemachineInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected StatemachineRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new StatemachineRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return StatemachineInjectorProvider.class
+				return StatemachineInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};
diff --git a/org.eclipse.xtext.xbase.web/src/test/xtext-gen/org/eclipse/xtext/web/example/entities/tests/EntitiesInjectorProvider.java b/org.eclipse.xtext.xbase.web/src/test/xtext-gen/org/eclipse/xtext/web/example/entities/tests/EntitiesInjectorProvider.java
index 378c862f7c0..a11162d18d3 100644
--- a/org.eclipse.xtext.xbase.web/src/test/xtext-gen/org/eclipse/xtext/web/example/entities/tests/EntitiesInjectorProvider.java
+++ b/org.eclipse.xtext.xbase.web/src/test/xtext-gen/org/eclipse/xtext/web/example/entities/tests/EntitiesInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected EntitiesRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new EntitiesRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return EntitiesInjectorProvider.class
+				return EntitiesInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/src-gen/org/eclipse/xtext/example/arithmetics/tests/ArithmeticsInjectorProvider.java b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/src-gen/org/eclipse/xtext/example/arithmetics/tests/ArithmeticsInjectorProvider.java
index 7a79b00cb3f..74387c34dbc 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/src-gen/org/eclipse/xtext/example/arithmetics/tests/ArithmeticsInjectorProvider.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/src-gen/org/eclipse/xtext/example/arithmetics/tests/ArithmeticsInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected ArithmeticsRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new ArithmeticsRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return ArithmeticsInjectorProvider.class
+				return ArithmeticsInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/src-gen/org/eclipse/xtext/example/domainmodel/tests/DomainmodelInjectorProvider.java b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/src-gen/org/eclipse/xtext/example/domainmodel/tests/DomainmodelInjectorProvider.java
index 1db3b8d28af..3da3f51ca5d 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/src-gen/org/eclipse/xtext/example/domainmodel/tests/DomainmodelInjectorProvider.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/src-gen/org/eclipse/xtext/example/domainmodel/tests/DomainmodelInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected DomainmodelRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new DomainmodelRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return DomainmodelInjectorProvider.class
+				return DomainmodelInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/src-gen/org/eclipse/xtext/example/fowlerdsl/tests/StatemachineInjectorProvider.java b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/src-gen/org/eclipse/xtext/example/fowlerdsl/tests/StatemachineInjectorProvider.java
index 86994997d48..33f75d0e478 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/src-gen/org/eclipse/xtext/example/fowlerdsl/tests/StatemachineInjectorProvider.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/src-gen/org/eclipse/xtext/example/fowlerdsl/tests/StatemachineInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected StatemachineRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new StatemachineRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return StatemachineInjectorProvider.class
+				return StatemachineInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/src-gen/org/eclipse/xtext/example/homeautomation/tests/RuleEngineInjectorProvider.java b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/src-gen/org/eclipse/xtext/example/homeautomation/tests/RuleEngineInjectorProvider.java
index 45639928b8c..1c22950af2e 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/src-gen/org/eclipse/xtext/example/homeautomation/tests/RuleEngineInjectorProvider.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/src-gen/org/eclipse/xtext/example/homeautomation/tests/RuleEngineInjectorProvider.java
@@ -48,10 +48,12 @@ public Injector createInjector() {
 	protected RuleEngineRuntimeModule createRuntimeModule() {
 		// make it work also with Maven/Tycho and OSGI
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		// allows for bindClassLoaderToInstance to get the class loader of the bundle
+		// containing the instance of the injector provider (possibly inherited)
 		return new RuleEngineRuntimeModule() {
 			@Override
 			public ClassLoader bindClassLoaderToInstance() {
-				return RuleEngineInjectorProvider.class
+				return RuleEngineInjectorProvider.this.getClass()
 						.getClassLoader();
 			}
 		};