diff --git a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
index 71618ba1..835e97c2 100644
--- a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
+++ b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
@@ -41,6 +41,8 @@ BaselineOfPharoLauncher >> baseline: spec [
 				spec requires: #('PharoLauncher-Tests-Core' ). ];
 			package: 'PharoLauncher-Tests-Functional' with: [
 				spec requires: #('PharoLauncher-Core' 'PharoLauncher-Tests-Download'). ];
+			package: 'PharoLauncher-Tests-Functional-Debug' with: [
+				spec requires: #('PharoLauncher-Tests-Functional' 'PharoLauncher-Core' 'PharoLauncher-Tests-Download'). ];
 			package: 'PharoLauncher-CLI' with: [ 
 				spec requires: #('Clap') ];
 			package: 'PharoLauncher-CLI-Tests' with: [ 
@@ -53,6 +55,7 @@ BaselineOfPharoLauncher >> baseline: spec [
 				'PharoLauncher-Spec2' 
 				'PharoLauncher-Tests-SpecUI' 
 				'PharoLauncher-Tests-Functional'
+				'PharoLauncher-Tests-Functional-Debug'
 				'PharoLauncher-CLI-Tests' 
 				'PharoLauncher-GToolkit' 
 				'PharoLauncher-Squeak') ]
diff --git a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
index ce8e6c78..fdfad171 100644
--- a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
+++ b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
@@ -381,7 +381,7 @@ PhLVirtualMachineManager >> imageVersion [
 		[ [ self imageVersionFromFile ]
 			on: PhLImageVersionDeterminationError
 			do: [ "no version file, generate it"
-					[ self imageVersionFromFileWith: (self imageVersionCommandWithPreferences: false) ]
+					[ 1 halt. self imageVersionFromFileWith: (self imageVersionCommandWithPreferences: false) ]
 						on: PhLImageVersionDeterminationError, PhLProcessTimeOut
 						do: [ "Command probably failed, try to run without --no-default-preferences option (only available since Pharo 3.0)"
 								self imageVersionFromFileWith: (self imageVersionCommandWithPreferences: true) ] ] ]
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st b/src/PharoLauncher-Tests-Functional-Debug/PhLVirtualMachineManagerFunctionalTest.class.st
similarity index 97%
rename from src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st
rename to src/PharoLauncher-Tests-Functional-Debug/PhLVirtualMachineManagerFunctionalTest.class.st
index c7f3add7..a1969b73 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st
+++ b/src/PharoLauncher-Tests-Functional-Debug/PhLVirtualMachineManagerFunctionalTest.class.st
@@ -8,7 +8,7 @@ Class {
 		'vmStoreBackup',
 		'tempVmStoreFolder'
 	],
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Functional-Debug'
 }
 
 { #category : #accessing }
@@ -49,7 +49,7 @@ PhLVirtualMachineManagerFunctionalTest >> testCanGetImageVersion [
 	self timeLimit: 30 seconds.
 
 	PhLVirtualMachineManagerTestResource current 
-		withCopyOfPharo90ImageDo: [ :imageRef | 
+		withCopyOfPharo90ImageDo: [ :imageRef | 1 halt.
 			version := (PhLVirtualMachineManager forImage: imageRef)
 				           imageVersion.
 			self assert: version equals: '90' ]
diff --git a/src/PharoLauncher-Tests-Functional-Debug/package.st b/src/PharoLauncher-Tests-Functional-Debug/package.st
new file mode 100644
index 00000000..dce94b83
--- /dev/null
+++ b/src/PharoLauncher-Tests-Functional-Debug/package.st
@@ -0,0 +1 @@
+Package { #name : #'PharoLauncher-Tests-Functional-Debug' }