diff --git a/src/Kernel/BlockClosure.class.st b/src/Kernel/BlockClosure.class.st
index 50efe0276bb..e22bf3fbb20 100644
--- a/src/Kernel/BlockClosure.class.st
+++ b/src/Kernel/BlockClosure.class.st
@@ -556,7 +556,7 @@ BlockClosure >> printOn: aStream [
 
 	aStream nextPutAll: ((self method hasSourceCode
 		or: [ "There is a decompiler"
-			Smalltalk globals includesKey: #FBDDecompiler ])
+			self class environment includesKey: #FBDDecompiler ])
 				ifTrue: [ self sourceNode formattedCode ]
 				ifFalse: [ 'aBlockClosure(no source code or decompiler available)' ])
 ]
diff --git a/src/Manifest-Tests/BuilderManifestTest.class.st b/src/Manifest-Tests/BuilderManifestTest.class.st
index 09e21ee61f1..391d9088f7a 100644
--- a/src/Manifest-Tests/BuilderManifestTest.class.st
+++ b/src/Manifest-Tests/BuilderManifestTest.class.st
@@ -4,6 +4,9 @@ A ManifestBuilderTest is a class to test the behavior of ManifestBuilder
 Class {
 	#name : #BuilderManifestTest,
 	#superclass : #TestCase,
+	#instVars : [
+		'environment'
+	],
 	#category : #'Manifest-Tests-Base'
 }
 
@@ -12,7 +15,8 @@ BuilderManifestTest >> setUp [
 	
 	| cl |
 	super setUp.
-	cl := Smalltalk globals at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
+	environment := self class environment.
+	cl := environment at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
 	cl
 		ifNotNil: [ 
 			cl
@@ -25,7 +29,7 @@ BuilderManifestTest >> setUp [
 BuilderManifestTest >> tearDown [
 	
 	| cl |
-	cl := Smalltalk globals at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
+	cl := environment at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
 	cl
 		ifNotNil: [ 
 			cl
@@ -252,7 +256,7 @@ BuilderManifestTest >> testContainsToDo [
 BuilderManifestTest >> testCreationManifest [
 	| manifestBuilder cl |
 	manifestBuilder := TheManifestBuilder new.
-	cl := Smalltalk globals at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
+	cl := environment at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
 	cl
 		ifNotNil: [ 
 			cl
@@ -267,7 +271,7 @@ BuilderManifestTest >> testCreationManifest [
 BuilderManifestTest >> testCreationManifestOn [
 	| manifestBuilder cl |
 	manifestBuilder := TheManifestBuilder new.
-	cl := Smalltalk globals at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
+	cl := environment at: #ManifestManifestResourcesTests ifAbsent: [ nil ].
 	cl
 		ifNotNil: [ 
 			cl