diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st
index c563596c..38a12817 100644
--- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st
+++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st
@@ -59,21 +59,6 @@ BaselineOfSpec2 >> defaultRepositoryURL [
 		ifAbsent: [ 'github://pharo-spec/Spec' ]
 ]
 
-{ #category : 'external projects' }
-BaselineOfSpec2 >> packageRepository [
-
-	" Tries to determine a repository from which the baseline is being loaded. Useful for 
-	refering other baselines in the same repository. "
-	
-	^ (self class package mcWorkingCopy repositoryGroup repositories 
-		reject: [:each | each = MCCacheRepository uniqueInstance]) 
-		ifNotEmpty: [ :repositories | 
-				repositories 
-					detect: [ :each | each description beginsWith: 'tonel://' ]
-					ifNone: [ repositories anyOne ] ]
-		ifEmpty: [ nil ]
-]
-
 { #category : 'accessing' }
 BaselineOfSpec2 >> project [
 	"Atomic loading is needed for Spec because we are moving classes of package and it breaks their subclasses. 
@@ -103,18 +88,20 @@ We need to use atomic loading only during update of existing Spec upgrade"
 { #category : 'external projects' }
 BaselineOfSpec2 >> specCore: spec [
 
-	spec baseline: 'SpecCore' with: [ 
-		spec 
-			repository: (self packageRepositoryURL ifEmpty: [ self defaultRepositoryURL ]);
-			loads: #('Base' 'Tests') ]
+	spec baseline: 'SpecCore' with: [
+		spec
+			repository: ((self packageRepositoryURLForSpec: spec) ifEmpty: [
+						 self defaultRepositoryURL ]);
+			loads: #( 'Base' 'Tests' ) ]
 ]
 
 { #category : 'external projects' }
 BaselineOfSpec2 >> specCoreCode: spec [
 
-	spec baseline: 'SpecCoreCode' with: [ 
-		spec 
-			repository: (self packageRepositoryURL ifEmpty: [ self defaultRepositoryURL ]);
+	spec baseline: 'SpecCoreCode' with: [
+		spec
+			repository: ((self packageRepositoryURLForSpec: spec) ifEmpty: [
+						 self defaultRepositoryURL ]);
 			className: 'BaselineOfSpecCore';
-			loads: #('Code' 'CodeTests') ]
+			loads: #( 'Code' 'CodeTests' ) ]
 ]