diff --git a/test/consuming-services.test.js b/test/consuming-services.test.js
index c86f5b49..20aeccb7 100644
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test ('@capire/bookshop')
 
-describe('Consuming Services locally', () => {
+describe('cap/samples - Consuming Services locally', () => {
   //
   it('bootstrapped the database successfully', ()=>{
     const { AdminService } = cds.services
diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js
index 0e7bf7e2..a5cd43c9 100644
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -3,7 +3,7 @@ const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('Custom Handlers', () => {
+describe('cap/samples - Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
     await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
diff --git a/test/hello-world.test.js b/test/hello-world.test.js
index bd7b24a7..5fd85f49 100644
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { GET, expect } = cds.test (__dirname+'/../hello')
 
-describe('Hello world!', () => {
+describe('cap/samples - Hello world!', () => {
 
   it('should say hello with class impl', async () => {
     const {data} = await GET `/say/hello(to='world')`
diff --git a/test/hierarchical-data.test.js b/test/hierarchical-data.test.js
index 167f6242..62f41830 100644
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -13,7 +13,7 @@ const model = cds.compile.to.csn (`
 const {Categories:Cats} = model.definitions
 
 
-describe('Hierarchical Data', ()=>{
+describe('cap/samples - Hierarchical Data', ()=>{
 
 	before ('bootstrap sqlite in-memory db...', async()=>{
 		await cds.deploy (model) .to ('sqlite::memory:')
diff --git a/test/localized-data/services.test.js b/test/localized-data/services.test.js
index 7de86e84..baed3321 100644
--- a/test/localized-data/services.test.js
+++ b/test/localized-data/services.test.js
@@ -2,7 +2,7 @@ const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname)
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('Localized Data', () => {
+describe('cap/samples - Localized Data', () => {
 
   it('serves localized $metadata documents', async () => {
     const { data } = await GET`/browse/$metadata?sap-language=de`
diff --git a/test/messaging.test.js b/test/messaging.test.js
index 04886fcf..d1426a8a 100644
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -4,7 +4,7 @@ const _model = '@capire/reviews'
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('Messaging', ()=>{
+describe('cap/samples - Messaging', ()=>{
 
     it ('should bootstrap sqlite in-memory db', async()=>{
         const db = await cds.deploy (_model) .to ('sqlite::memory:')
diff --git a/test/odata.test.js b/test/odata.test.js
index 06eeeb66..8cee00ee 100644
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -2,7 +2,7 @@ const cds = require('@sap/cds/lib')
 const { GET, expect, axios } = cds.test ('@capire/bookshop')
 axios.defaults.auth = { username: 'alice', password: 'admin' }
 
-describe('OData Protocol', () => {
+describe('cap/samples - Bookshop APIs', () => {
 
 
   it('serves $metadata documents in v4', async () => {
@@ -74,9 +74,6 @@ describe('OData Protocol', () => {
       { ID: 271, title: 'Catweazle' },
     ])
   })
-})
-
-describe('Misc', () => {
 
   it('serves user info', async () => {
     {
@@ -89,4 +86,4 @@ describe('Misc', () => {
     }
   })
 
-})
\ No newline at end of file
+})
diff --git a/test/registry.test.js b/test/registry.test.js
index fce83b25..267821ad 100644
--- a/test/registry.test.js
+++ b/test/registry.test.js
@@ -6,7 +6,7 @@ const { resolve } = require('path')
 const verbose = process.env.CDS_TEST_VERBOSE
 // ||true
 
-describe('Local NPM registry', () => {
+describe('cap/samples - Local NPM registry', () => {
   let registry
   let axios
   const cwd = resolve(__dirname, '..')