diff --git a/bookshop/srv/admin-service.js b/bookshop/srv/admin-service.js
index d737a65a..7ab5ca6d 100644
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 module.exports = class AdminService extends cds.ApplicationService { init(){
   this.before ('NEW','Authors', genid)
diff --git a/loggers/srv/loggers.js b/loggers/srv/loggers.js
index 5fcd7226..df82decd 100644
--- a/loggers/srv/loggers.js
+++ b/loggers/srv/loggers.js
@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds/lib')
+const cds = require ('@sap/cds')
 const LOG = cds.log('cds.log')
 
 module.exports = class LogService extends cds.Service {
diff --git a/test/cds.ql.test.js b/test/cds.ql.test.js
index 09f05447..0049fe13 100644
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { expect } = cds.test
 
 describe('cds.ql → cqn', () => {
diff --git a/test/consuming-services.test.js b/test/consuming-services.test.js
index deb0e18d..d2219eb2 100644
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Consuming Services locally', () => {
 
diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js
index 5bd8acda..e4cebccd 100644
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Custom Handlers', () => {
 
diff --git a/test/fiori.test.js b/test/fiori.test.js
index 2ccf7f79..2a68f277 100644
--- a/test/fiori.test.js
+++ b/test/fiori.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Fiori APIs - v2', function() {
 
diff --git a/test/hello-world.test.js b/test/hello-world.test.js
index 30f3c5d8..a68cb88b 100644
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Hello world!', () => {
 
diff --git a/test/hierarchical-data.test.js b/test/hierarchical-data.test.js
index 73ae0acd..f1b06818 100644
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { expect } = cds.test.in(__dirname,'..')
 
 describe('cap/samples - Hierarchical Data', ()=>{
diff --git a/test/localized-data/services.test.js b/test/localized-data/services.test.js
index 8ec30485..b4bc7a20 100644
--- a/test/localized-data/services.test.js
+++ b/test/localized-data/services.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Localized Data', () => {
 
diff --git a/test/messaging.test.js b/test/messaging.test.js
index 9e9ab66c..4b441da1 100644
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Messaging', ()=>{
 
diff --git a/test/odata.test.js b/test/odata.test.js
index a35eab01..7d675a69 100644
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Bookshop APIs', () => {
   const { GET, expect, axios } = cds.test ('@capire/bookshop')