diff --git a/.travis.yml b/.travis.yml
index ca457fe6..97321b55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ matrix:
     - smalltalk: Squeak-5.1
  
   include:
+    - smalltalk: Pharo64-8.0
+      env: BUILD_NAME=Pharo64-8.0
     - smalltalk: Pharo64-7.0
       env: BUILD_NAME=Pharo64-7.0
     - smalltalk: Pharo64-6.1
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
index 8182da7d..4e9bd050 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
@@ -59,4 +59,24 @@ baselinePharo: spec
 					with: [ spec requires: #('Grease-Pharo40-Slime') ].
 			spec
 				group: 'Slime' with: #('Grease-Pharo40-Slime');
-				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
\ No newline at end of file
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+	spec
+		for: #(#'pharo8.x')
+		do: [ spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Pharo70-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Pharo70-Core');
+						includes: #('Grease-Tests-Pharo-Core') ];
+				package: 'Grease-Pharo70-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Pharo-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Pharo40-Slime'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Pharo40-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Pharo40-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]