diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
index 6ef8136a..a1172385 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
@@ -1,14 +1,14 @@
 testing
 testClassesForCategories
 	| classes size |
-	classes := SmalltalkCI classesForCategories: #('SmalltalkCI-Core').
+	classes := SmalltalkCI platformClass classesForCategories: #('SmalltalkCI-Core').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
 	self deny: (classes includes: SmalltalkCISpecTest).
 	self assert: classes size equals: (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
 	
-	classes := SmalltalkCI classesForCategories: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
+	classes := SmalltalkCI platformClass classesForCategories: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self assert: (classes includes: SmalltalkCITest).
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesFrom.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesFrom.st
index 1a5bd5fe..60b9ae82 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesFrom.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesFrom.st
@@ -5,7 +5,7 @@ testClassesFrom
         add: #'classes' -> #(Dictionary);
         add: #'categories' -> #('SmalltalkCI-Core');
         yourself).
-	classes := SmalltalkCI classesFrom: testing.
+	classes := SmalltalkCI platformClass classesFrom: testing.
 	self assert: (classes includes: Dictionary).
 	self assert: (classes includes: SmalltalkCI).
 	self deny: (classes includes: SmalltalkCITest).
@@ -13,7 +13,7 @@ testClassesFrom
 	testing := (Dictionary new
         add: #'packages' -> #('SmalltalkCI-Core');
         yourself).
-	classes := SmalltalkCI classesFrom: testing.
+	classes := SmalltalkCI platformClass classesFrom: testing.
 	self deny: (classes includes: Dictionary).
 	self assert: (classes includes: SmalltalkCI).
 	self deny: (classes includes: SmalltalkCITest).
@@ -21,7 +21,7 @@ testClassesFrom
 	testing := (Dictionary new
         add: #'packages' -> #('SmalltalkCI-*');
         yourself).
-	classes := SmalltalkCI classesFrom: testing.
+	classes := SmalltalkCI platformClass classesFrom: testing.
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCITest).
 	self assert: (classes includes: SCIExcludedTests)
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInCategory.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInCategory.st
index 52878967..a7f7ef92 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInCategory.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInCategory.st
@@ -1,7 +1,7 @@
 testing
 testClassesInCategory
 	| classes |
-	classes := SmalltalkCI classesInCategory: 'SmalltalkCI-Core'.
+	classes := SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core'.
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithCategoryNames.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithCategoryNames.st
index 624006ef..332fac17 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithCategoryNames.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithCategoryNames.st
@@ -1,19 +1,19 @@
 testing
 testClassesWithCategoryNames
 	| classes size |
-	classes := SmalltalkCI classesWithCategoryNames: #('SmalltalkCI-Core').
+	classes := SmalltalkCI platformClass classesWithCategoryNames: #('SmalltalkCI-Core').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
 	self deny: (classes includes: SmalltalkCISpecTest).
-	self assert: classes size equals: (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
+	self assert: classes size equals: (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.
 	
-	classes := SmalltalkCI classesWithCategoryNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
+	classes := SmalltalkCI platformClass classesWithCategoryNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self assert: (classes includes: SmalltalkCITest).
 	self assert: (classes includes: SmalltalkCISpecTest).
 	self deny: (classes includes: Object).
-	size := (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
-	size := size + (SmalltalkCI classesInCategory: 'SmalltalkCI-Tests') size.
+	size := (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.
+	size := size + (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Tests') size.
 	self assert: classes size equals: size.
\ No newline at end of file