diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st
index e30e2db5fd..9699af5c2d 100644
--- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st
+++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st
@@ -11,7 +11,7 @@ IceMetacelloIntegrationWithMissingClone >> repositoryName [
 	^ 'test-project-source-properties-tonel'
 ]
 
-{ #category : 'tests' }
+{ #category : 'running' }
 IceMetacelloIntegrationWithMissingClone >> setUp [
 
 	super setUp.
@@ -27,7 +27,7 @@ IceMetacelloIntegrationWithMissingClone >> setUp [
 	
 ]
 
-{ #category : 'tests' }
+{ #category : 'running' }
 IceMetacelloIntegrationWithMissingClone >> tearDown [
 
 	super tearDown.
diff --git a/Iceberg-Tests/IceGitCloneTest.class.st b/Iceberg-Tests/IceGitCloneTest.class.st
index 567026f166..d816970887 100644
--- a/Iceberg-Tests/IceGitCloneTest.class.st
+++ b/Iceberg-Tests/IceGitCloneTest.class.st
@@ -15,7 +15,7 @@ IceGitCloneTest >> newFixture [
 	^ IceNotYetClonedRepositoryFixture inGit
 ]
 
-{ #category : 'tests' }
+{ #category : 'running' }
 IceGitCloneTest >> setUp [
 
 	super setUp.
@@ -23,7 +23,7 @@ IceGitCloneTest >> setUp [
 	IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider.
 ]
 
-{ #category : 'tests' }
+{ #category : 'running' }
 IceGitCloneTest >> tearDown [
 
 	IceCredentialsProvider providerType: oldProviderType.
diff --git a/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st b/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st
index f8844d96a2..c401d318bb 100644
--- a/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st
+++ b/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st
@@ -11,19 +11,19 @@ Class {
 	#tag : 'Browsers'
 }
 
-{ #category : 'running' }
+{ #category : 'factory' }
 IceTipRepositoriesBrowserTest >> newFixture [
 	
 	^ IceSinglePackageFixture inGit
 ]
 
-{ #category : 'testing' }
+{ #category : 'factory' }
 IceTipRepositoriesBrowserTest >> newRepositoryNamed: aName [
 
 	^ fixture factory newRepositoryNamed: aName
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoriesBrowserTest >> setUp [
 
 	| alphabeticallyLastRepository |
@@ -44,7 +44,7 @@ IceTipRepositoriesBrowserTest >> setUp [
 	presenter open
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoriesBrowserTest >> tearDown [
 	presenter ifNotNil: [ presenter window close ]. super tearDown
 ]
diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st
index a5f28544c3..e7f571972c 100644
--- a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st
+++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st
@@ -6,12 +6,12 @@ Class {
 	#tag : 'Browsers'
 }
 
-{ #category : 'running' }
+{ #category : 'factory' }
 IceTipRepositoryBrowserWithRemoteTest >> newFixture [
 	^ IceWithRemoteFixture inGit
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoryBrowserWithRemoteTest >> setUp [
 
 	super setUp.
@@ -19,7 +19,7 @@ IceTipRepositoryBrowserWithRemoteTest >> setUp [
 	presenter open
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoryBrowserWithRemoteTest >> tearDown [
 	presenter ifNotNil: [ "super tearDown" presenter window close ].
 	super tearDown.
diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st
index abbbb5298f..b74f55a8c6 100644
--- a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st
+++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st
@@ -6,13 +6,13 @@ Class {
 	#tag : 'Browsers'
 }
 
-{ #category : 'running' }
+{ #category : 'factory' }
 IceTipRepositoryBrowserWithoutRemoteTest >> newFixture [
 	
 	^ IceSinglePackageFixture inGit
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoryBrowserWithoutRemoteTest >> setUp [
 
 	super setUp.
@@ -20,7 +20,7 @@ IceTipRepositoryBrowserWithoutRemoteTest >> setUp [
 	presenter open
 ]
 
-{ #category : 'testing' }
+{ #category : 'running' }
 IceTipRepositoryBrowserWithoutRemoteTest >> tearDown [
 
 	presenter ifNotNil: [ presenter window close ]
diff --git a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st
index 8d4320b1f7..c946c9a334 100644
--- a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st
+++ b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st
@@ -9,13 +9,13 @@ Class {
 	#tag : 'Browsers'
 }
 
-{ #category : 'running' }
+{ #category : 'factory' }
 IceTipWorkingCopyBrowserWithRemoteTest >> newFixture [
 
 	^ IceClonedFromRemoteFixture inGit
 ]
 
-{ #category : 'tests-fetch' }
+{ #category : 'running' }
 IceTipWorkingCopyBrowserWithRemoteTest >> setUp [
 
 	super setUp.