diff --git a/src/PharoLauncher-Tests-Functional/PhLAbstractTemplateGroupTest.class.st b/src/PharoLauncher-Tests-Debug/PhLAbstractTemplateGroupTest.class.st
similarity index 96%
rename from src/PharoLauncher-Tests-Functional/PhLAbstractTemplateGroupTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLAbstractTemplateGroupTest.class.st
index 4689aded0..5b8e835f3 100644
--- a/src/PharoLauncher-Tests-Functional/PhLAbstractTemplateGroupTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLAbstractTemplateGroupTest.class.st
@@ -4,7 +4,7 @@ Give me unit tests and I will make sure they are run for all subclasses of PhLAb
 Class {
 	#name : #PhLAbstractTemplateGroupTest,
 	#superclass : #ClassTestCase,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #testing }
diff --git a/src/PharoLauncher-Tests-Functional/PhLHTTPListingTemplateGroupTest.class.st b/src/PharoLauncher-Tests-Debug/PhLHTTPListingTemplateGroupTest.class.st
similarity index 99%
rename from src/PharoLauncher-Tests-Functional/PhLHTTPListingTemplateGroupTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLHTTPListingTemplateGroupTest.class.st
index bda9b24a1..8b8694399 100644
--- a/src/PharoLauncher-Tests-Functional/PhLHTTPListingTemplateGroupTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLHTTPListingTemplateGroupTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PhLHTTPListingTemplateGroupTest,
 	#superclass : #PhLAbstractTemplateGroupTest,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #coverage }
diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchedImagesWatcherTest.class.st b/src/PharoLauncher-Tests-Debug/PhLLaunchedImagesWatcherTest.class.st
similarity index 94%
rename from src/PharoLauncher-Tests-Functional/PhLLaunchedImagesWatcherTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLLaunchedImagesWatcherTest.class.st
index 1fa3d9974..2d26dc8a9 100644
--- a/src/PharoLauncher-Tests-Functional/PhLLaunchedImagesWatcherTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLLaunchedImagesWatcherTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PhLLaunchedImagesWatcherTest,
 	#superclass : #TestCase,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #tests }
diff --git a/src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st b/src/PharoLauncher-Tests-Debug/PhLOsXCatalinaTestImage.class.st
similarity index 91%
rename from src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st
rename to src/PharoLauncher-Tests-Debug/PhLOsXCatalinaTestImage.class.st
index 35bbc7a52..d808e3ce0 100644
--- a/src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLOsXCatalinaTestImage.class.st
@@ -6,7 +6,7 @@ It is used to test support of 32-bit app as  Mac Os Catalina is the first Mac Os
 Class {
 	#name : #PhLOsXCatalinaTestImage,
 	#superclass : #PhLImage,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #testing }
diff --git a/src/PharoLauncher-Tests-Functional/PhLProcessWrapperTest.class.st b/src/PharoLauncher-Tests-Debug/PhLProcessWrapperTest.class.st
similarity index 99%
rename from src/PharoLauncher-Tests-Functional/PhLProcessWrapperTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLProcessWrapperTest.class.st
index 8d7f3f02d..6faed31ba 100644
--- a/src/PharoLauncher-Tests-Functional/PhLProcessWrapperTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLProcessWrapperTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'process'
 	],
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #running }
diff --git a/src/PharoLauncher-Tests-Functional/PhLUnixSubprocessTest.class.st b/src/PharoLauncher-Tests-Debug/PhLUnixSubprocessTest.class.st
similarity index 96%
rename from src/PharoLauncher-Tests-Functional/PhLUnixSubprocessTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLUnixSubprocessTest.class.st
index f8acab8a2..3593dab75 100644
--- a/src/PharoLauncher-Tests-Functional/PhLUnixSubprocessTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLUnixSubprocessTest.class.st
@@ -4,7 +4,7 @@ This class contains tests to ensure we can expected behaviour from the library u
 Class {
 	#name : #PhLUnixSubprocessTest,
 	#superclass : #TestCase,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #tests }
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st b/src/PharoLauncher-Tests-Debug/PhLVirtualMachineManagerTestResource.class.st
similarity index 98%
rename from src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st
rename to src/PharoLauncher-Tests-Debug/PhLVirtualMachineManagerTestResource.class.st
index 379c52275..eaa840319 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLVirtualMachineManagerTestResource.class.st
@@ -15,7 +15,7 @@ Class {
 		'imagesFolder',
 		'workspace'
 	],
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #configuring }
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st b/src/PharoLauncher-Tests-Debug/PhLVirtualMachineTest.class.st
similarity index 98%
rename from src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st
rename to src/PharoLauncher-Tests-Debug/PhLVirtualMachineTest.class.st
index aee3fb13b..8131773c1 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st
+++ b/src/PharoLauncher-Tests-Debug/PhLVirtualMachineTest.class.st
@@ -3,7 +3,7 @@ Class {
 	#superclass : #TestCase,
 	#traits : 'TPhLVirtualMachineTestUtil',
 	#classTraits : 'TPhLVirtualMachineTestUtil classTrait',
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #tests }
diff --git a/src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st b/src/PharoLauncher-Tests-Debug/TestMacOSXCatalinaPlatform.class.st
similarity index 83%
rename from src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st
rename to src/PharoLauncher-Tests-Debug/TestMacOSXCatalinaPlatform.class.st
index 1f72479dc..5e2fb576a 100644
--- a/src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st
+++ b/src/PharoLauncher-Tests-Debug/TestMacOSXCatalinaPlatform.class.st
@@ -4,7 +4,7 @@ I'm used to represent a Mac OS X Catalina operating system for test purposes.
 Class {
 	#name : #TestMacOSXCatalinaPlatform,
 	#superclass : #MacOSXPlatform,
-	#category : #'PharoLauncher-Tests-Functional'
+	#category : #'PharoLauncher-Tests-Debug'
 }
 
 { #category : #accessing }
diff --git a/src/PharoLauncher-Tests-Functional/ZipArchiveMember.extension.st b/src/PharoLauncher-Tests-Debug/ZipArchiveMember.extension.st
similarity index 83%
rename from src/PharoLauncher-Tests-Functional/ZipArchiveMember.extension.st
rename to src/PharoLauncher-Tests-Debug/ZipArchiveMember.extension.st
index 4bc7125e0..6912ece4c 100644
--- a/src/PharoLauncher-Tests-Functional/ZipArchiveMember.extension.st
+++ b/src/PharoLauncher-Tests-Debug/ZipArchiveMember.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #ZipArchiveMember }
 
-{ #category : #'*PharoLauncher-Tests-Functional' }
+{ #category : #'*PharoLauncher-Tests-Debug' }
 ZipArchiveMember >> binaryContentsFrom: start to: finish [
 	"Answer my contents as a string."
 	| s |