diff --git a/package.json b/package.json
index 43fbe73..deb86ba 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "klona": "^2.0.5",
     "mocha": "^10.0.0",
     "uuid": "^8.3.2",
-    "vc-api-test-suite-implementations": "github:w3c-ccg/vc-api-test-suite-implementations"
+    "vc-api-test-suite-implementations": "github:w3c-ccg/vc-api-test-suite-implementations#filterByTag-returns-respective-endpoint"
   },
   "devDependencies": {
     "eslint": "^8.19.0",
diff --git a/tests/10-issuer.js b/tests/10-issuer.js
index e3f3d14..0375201 100644
--- a/tests/10-issuer.js
+++ b/tests/10-issuer.js
@@ -27,9 +27,8 @@ describe('Issue Credential - Data Integrity', function() {
   this.columnLabel = 'Issuer';
   // the reportData will be displayed under the test title
   this.reportData = reportData;
-  for(const [name, implementation] of match) {
-    const issuer = implementation.issuers.find(
-      issuer => issuer.tags.has('VC-API'));
+  for(const [name, {endpoints}] of match) {
+    const [issuer] = endpoints;
     describe(name, function() {
       it('MUST successfully issue a credential.', async function() {
         this.test.cell = {
diff --git a/tests/11-issuer-jwt.js b/tests/11-issuer-jwt.js
index 721b03a..f269f37 100644
--- a/tests/11-issuer-jwt.js
+++ b/tests/11-issuer-jwt.js
@@ -24,9 +24,8 @@ describe('Issue Credential - JWT', function() {
   this.columnLabel = 'Issuer';
   // the reportData will be displayed under the test title
   this.reportData = reportData;
-  for(const [name, implementation] of match) {
-    const issuer = implementation.issuers.find(issuer =>
-      issuer.tags.has('VC-API') && issuer.tags.has('JWT'));
+  for(const [name, {endpoints}] of match) {
+    const [issuer] = endpoints;
     describe(name, function() {
       it('MUST successfully issue a credential.', async function() {
         this.test.cell = {