diff --git a/Jenkinsfile b/Jenkinsfile
index f159aeba82d..15af2650353 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -190,6 +190,7 @@ def bootstrapImage(){
         isoTesters['Zinc-Character-Encoding'] = { defineIsoTestStage("Zinc-Character-Encoding", "ZincCharacterEncoding", "\'Zinc-Character-Encoding-Tests\'") }
         isoTesters['System-SessionManager'] = { defineIsoTestStage("System-SessionManager", "SystemSessionManager", "\'System-SessionManager-Tests\'") }
         isoTesters['System-Platforms'] = { defineIsoTestStage("System-Platforms", "SystemPlatforms", "\'System-Platforms-Tests\'") }  
+        isoTesters['Announcements-Core'] = { defineIsoTestStage("Announcements-Core", "Announcements", "\'Announcements-Core-Tests\'") } 
         isoTesters['Shift-ClassBuilder'] = { defineIsoTestStage("Shift-ClassBuilder", "Shift", "\'Shift-ClassBuilder-Tests\'") }        
         parallel isoTesters
 
diff --git a/src/BaselineOfAnnouncements/BaselineOfAnnouncements.class.st b/src/BaselineOfAnnouncements/BaselineOfAnnouncements.class.st
new file mode 100644
index 00000000000..ff56973893b
--- /dev/null
+++ b/src/BaselineOfAnnouncements/BaselineOfAnnouncements.class.st
@@ -0,0 +1,20 @@
+Class {
+	#name : 'BaselineOfAnnouncements',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfAnnouncements',
+	#package : 'BaselineOfAnnouncements'
+}
+
+{ #category : 'baselines' }
+BaselineOfAnnouncements >> baseline: spec [
+
+	<baseline>
+	spec for: #common do: [
+			spec
+				package: 'Announcements-Core';
+				package: 'Announcements-Core-Tests' with: [ spec requires: #( 'Announcements-Core' ) ].
+
+			spec
+				group: 'Core' with: { 'Announcements-Core' };
+				group: 'Tests' with: { 'Announcements-Core-Tests' } ]
+]
diff --git a/src/BaselineOfAnnouncements/package.st b/src/BaselineOfAnnouncements/package.st
new file mode 100644
index 00000000000..37c6b88a3c2
--- /dev/null
+++ b/src/BaselineOfAnnouncements/package.st
@@ -0,0 +1 @@
+Package { #name : 'BaselineOfAnnouncements' }
diff --git a/src/BaselineOfKernel/BaselineOfKernel.class.st b/src/BaselineOfKernel/BaselineOfKernel.class.st
index 2d416c3790c..3091ae1fff8 100644
--- a/src/BaselineOfKernel/BaselineOfKernel.class.st
+++ b/src/BaselineOfKernel/BaselineOfKernel.class.st
@@ -50,6 +50,13 @@ BaselineOfKernel >> baseline: spec [
 						className: 'BaselineOfSystemPlatforms';
 						repository: (self packageRepositoryURLForSpec: spec);
 						loads: #( 'Tests' )];
+					
+				baseline: 'Announcements-Core-Tests' with: [ 
+					spec
+						className: 'BaselineOfAnnouncements';
+						repository: repository;
+						loads: #( 'Tests' )];
+					
 				package: 'Announcements-Core';
 				package: 'Collections-Abstract';
 				package: 'Collections-DoubleLinkedList';
@@ -97,7 +104,6 @@ BaselineOfKernel >> baseline: spec [
 				package: 'Collections-Weak-Tests' with: [ spec requires: #( 'Collections-Unordered-Tests' ) ];
 				package: 'Kernel-Tests';
 				package: 'Kernel-CodeModel-Tests';
-				package: 'Announcements-Core-Tests';
 				package: 'System-Finalization-Tests';
 				package: 'System-Time-Tests'.
 
diff --git a/src/BaselineOfSystemAnnouncements/BaselineOfSystemAnnouncements.class.st b/src/BaselineOfSystemAnnouncements/BaselineOfSystemAnnouncements.class.st
new file mode 100644
index 00000000000..245acce5e0e
--- /dev/null
+++ b/src/BaselineOfSystemAnnouncements/BaselineOfSystemAnnouncements.class.st
@@ -0,0 +1,27 @@
+Class {
+	#name : 'BaselineOfSystemAnnouncements',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfSystemAnnouncements',
+	#package : 'BaselineOfSystemAnnouncements'
+}
+
+{ #category : 'baselines' }
+BaselineOfSystemAnnouncements >> baseline: spec [
+
+	<baseline>
+	
+	| repository |
+	repository := self packageRepositoryURLForSpec: spec.
+	spec for: #common do: [
+			spec
+				baseline: 'Announcements' with: [ 
+					spec
+						className: 'BaselineOfAnnouncements';
+						repository: repository;
+						loads: 'Core'];
+				package: 'System-Announcements' with: [spec requires: #('Announcements')].
+
+			spec
+				group: 'Core' with: #('System-Announcements');
+            group: 'default' with: #('Core')]
+]
diff --git a/src/BaselineOfSystemAnnouncements/package.st b/src/BaselineOfSystemAnnouncements/package.st
new file mode 100644
index 00000000000..884453ebe6f
--- /dev/null
+++ b/src/BaselineOfSystemAnnouncements/package.st
@@ -0,0 +1 @@
+Package { #name : 'BaselineOfSystemAnnouncements' }