diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
index 1f3a3be48..a44c285d2 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
@@ -30,8 +30,8 @@ StHaltAndBreakpointControlTest >> methodWithHaltSources [
 
 { #category : #helpers }
 StHaltAndBreakpointControlTest >> removeMethodsWithHalts [
-	self testClass methods
-		do: [ :method | self testClass removeSelector: method selector]
+
+	(self testClass methods select: [ :m | m selector includesSubstring: 'Halt' ]) do: [ :method | self testClass removeSelector: method selector ]
 ]
 
 { #category : #running }
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
index 7818aaf00..4abe11b89 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
@@ -58,7 +58,7 @@ StHaltCacheTest >> testInitialCacheBuild [
 	self assert: cache methodsWithHalts size equals: 6.
 	(self testClass methods
 		reject: [ :m | 
-			#('StDummyTestClassWithHalts>>#mNoHalt' 'StDummyTestClassWithHalts>>#mRejectHalt')
+			#('StDummyTestClassWithHalts>>#mNoHalt' 'StDummyTestClassWithHalts>>#mRejectHalt' 'StDummyTestClassWithHalts>>#var')
 				includes: m printString ])
 		do: [ :method | 
 			| haltNode nodeCache |