diff --git a/tools/integration/package.json b/tools/integration/package.json
index d538597..787b658 100644
--- a/tools/integration/package.json
+++ b/tools/integration/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "test": "npm run mocha && npm run lint",
     "e2e-test-harvest": "mocha test/harvestTest.js",
-    "e2e-test-service": "mocha test/serviceTest.js",
+    "e2e-test-service": "mocha --exit \"test/e2e-test-service/**/*.js\"",
     "mocha": "mocha --exit \"test/lib/**/*.js\"",
     "lint": "npm run prettier:check && npm run eslint",
     "lint:fix": "npm run prettier:write && npm run eslint:fix",
diff --git a/tools/integration/test/e2e-test-service/attachmentTest.js b/tools/integration/test/e2e-test-service/attachmentTest.js
new file mode 100644
index 0000000..c2eabcf
--- /dev/null
+++ b/tools/integration/test/e2e-test-service/attachmentTest.js
@@ -0,0 +1,45 @@
+// (c) Copyright 2024, SAP SE and ClearlyDefined contributors. Licensed under the MIT license.
+// SPDX-License-Identifier: MIT
+
+const { callFetch } = require('../../lib/fetch')
+const { devApiBaseUrl, prodApiBaseUrl, components, definition } = require('../testConfig')
+const { strictEqual } = require('assert')
+
+describe('Validation attachments between dev and prod', function () {
+  this.timeout(definition.timeout * 2)
+
+  //Rest a bit to avoid overloading the servers
+  afterEach(() => new Promise(resolve => setTimeout(resolve, definition.timeout / 2)))
+
+  components.forEach(coordinates => {
+    it(`should have the same attachement as prod for ${coordinates}`, () => fetchAndCompareAttachments(coordinates))
+  })
+})
+
+async function fetchAndCompareAttachments(coordinates) {
+  const expectedAttachments = await findAttachments(prodApiBaseUrl, coordinates)
+  for (const sha256 of expectedAttachments) {
+    await compareAttachment(sha256)
+  }
+}
+
+async function findAttachments(apiBaseUrl, coordinates) {
+  const definition = await getDefinition(apiBaseUrl, coordinates)
+  return definition.files.filter(f => f.natures || [].includes('license')).map(f => f.hashes.sha256)
+}
+
+async function compareAttachment(sha256) {
+  const [devAttachment, prodAttachment] = await Promise.all(
+    [callFetch(`${devApiBaseUrl}/attachments/${sha256}`), callFetch(`${prodApiBaseUrl}/attachments/${sha256}`)].map(p =>
+      p.then(r => r.text())
+    )
+  )
+  strictEqual(devAttachment, prodAttachment)
+}
+
+async function getDefinition(apiBaseUrl, coordinates, reCompute = false) {
+  reCompute = apiBaseUrl === devApiBaseUrl && reCompute
+  let url = `${apiBaseUrl}/definitions/${coordinates}`
+  if (reCompute) url += '?force=true'
+  return await callFetch(url).then(r => r.json())
+}
diff --git a/tools/integration/test/e2e-test-service/curationTest.js b/tools/integration/test/e2e-test-service/curationTest.js
new file mode 100644
index 0000000..69515a1
--- /dev/null
+++ b/tools/integration/test/e2e-test-service/curationTest.js
@@ -0,0 +1,112 @@
+// (c) Copyright 2024, SAP SE and ClearlyDefined contributors. Licensed under the MIT license.
+// SPDX-License-Identifier: MIT
+
+const { deepStrictEqual, strictEqual, ok } = require('assert')
+const { callFetch, buildPostOpts } = require('../../lib/fetch')
+const { devApiBaseUrl, components, definition } = require('../testConfig')
+
+describe('Validate curation', function () {
+  this.timeout(definition.timeout)
+
+  //Rest a bit to avoid overloading the servers
+  afterEach(() => new Promise(resolve => setTimeout(resolve, definition.timeout / 2)))
+
+  const coordinates = components[0]
+
+  describe('Propose curation', function () {
+    const [type, provider, namespace, name, revision] = coordinates.split('/')
+    const curation = {
+      described: {
+        releaseDate: new Date().toISOString().substring(0, 10) //yyyy-mm-dd
+      }
+    }
+    let prNumber
+
+    before('curate', async function () {
+      const curationResponse = await callFetch(
+        `${devApiBaseUrl}/curations`,
+        buildCurationOpts(coordinates, type, provider, namespace, name, revision, curation)
+      ).then(r => r.json())
+      prNumber = curationResponse.prNumber
+    })
+
+    it('should create the PR via curation', async function () {
+      ok(prNumber)
+    })
+
+    it(`should get the curation by PR via /curations/${coordinates}/pr`, async function () {
+      const fetchedCuration = await callFetch(`${devApiBaseUrl}/curations/${coordinates}/pr/${prNumber}`).then(r =>
+        r.json()
+      )
+      deepStrictEqual(fetchedCuration, curation)
+    })
+
+    it(`should reflect the PR in definition preview via definitions/${coordinates}/pr`, async function () {
+      const curatedDefinition = await callFetch(`${devApiBaseUrl}/definitions/${coordinates}/pr/${prNumber}`).then(r =>
+        r.json()
+      )
+      strictEqual(curatedDefinition.described.releaseDate, curation.described.releaseDate)
+    })
+
+    it(`should get of list of PRs for component via /curations/${type}/${provider}/${namespace}/${name}`, async function () {
+      const response = await callFetch(`${devApiBaseUrl}/curations/${type}/${provider}/${namespace}/${name}`).then(r =>
+        r.json()
+      )
+      const proposedPR = response.contributions.filter(c => c.prNumber === prNumber)
+      ok(proposedPR)
+    })
+
+    it('should get PRs for components via post /curations', async function () {
+      const revisionlessCoordinates = `${type}/${provider}/${namespace}/${name}`
+      const response = await callFetch(`${devApiBaseUrl}/curations`, buildPostOpts([revisionlessCoordinates])).then(r =>
+        r.json()
+      )
+      const proposedPR = response[revisionlessCoordinates].contributions.filter(c => c.prNumber === prNumber)
+      ok(proposedPR)
+    })
+  })
+
+  describe('Merged curation', function () {
+    const curatedCoordinates = 'npm/npmjs/@nestjs/platform-express/6.2.2'
+    const expected = {
+      licensed: {
+        declared: 'Apache-2.0'
+      }
+    }
+    it(`should get merged curation for coordinates via /curations/${curatedCoordinates}`, async function () {
+      const response = await callFetch(`${devApiBaseUrl}/curations/${curatedCoordinates}`).then(r => r.json())
+      deepStrictEqual(response, expected)
+    })
+
+    it(`should reflect merged curation in definition for coordinates ${curatedCoordinates}`, async function () {
+      const curatedDefinition = await getDefinition(devApiBaseUrl, curatedCoordinates, true)
+      deepStrictEqual(curatedDefinition.licensed.declared, expected.licensed.declared)
+    })
+  })
+})
+
+function buildCurationOpts(coordinates, type, provider, namespace, name, revision, curation) {
+  const contributionInfo = {
+    type: 'other',
+    summary: `test ${coordinates}`
+  }
+  const patch = {
+    coordinates: { type, provider, namespace, name },
+    revisions: {
+      [revision]: curation
+    }
+  }
+  const curationBody = { contributionInfo, patches: [patch] }
+  return {
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(curationBody)
+  }
+}
+
+async function getDefinition(apiBaseUrl, coordinates, reCompute = false) {
+  reCompute = apiBaseUrl === devApiBaseUrl && reCompute
+  let url = `${apiBaseUrl}/definitions/${coordinates}`
+  if (reCompute) url += '?force=true'
+  return await callFetch(url).then(r => r.json())
+}
diff --git a/tools/integration/test/e2e-test-service/definitionTest.js b/tools/integration/test/e2e-test-service/definitionTest.js
new file mode 100644
index 0000000..6cf012d
--- /dev/null
+++ b/tools/integration/test/e2e-test-service/definitionTest.js
@@ -0,0 +1,115 @@
+// (c) Copyright 2024, SAP SE and ClearlyDefined contributors. Licensed under the MIT license.
+// SPDX-License-Identifier: MIT
+
+const { omit, isEqual } = require('lodash')
+const { deepStrictEqual, strictEqual } = require('assert')
+const { callFetch, buildPostOpts } = require('../../lib/fetch')
+const { devApiBaseUrl, prodApiBaseUrl, components, definition } = require('../testConfig')
+
+describe('Validation definitions between dev and prod', function () {
+  this.timeout(definition.timeout)
+
+  //Rest a bit to avoid overloading the servers
+  afterEach(() => new Promise(resolve => setTimeout(resolve, definition.timeout / 2)))
+
+  describe('Validation between dev and prod', function () {
+    components.forEach(coordinates => {
+      it(`should return the same definition as prod for ${coordinates}`, () => fetchAndCompareDefinition(coordinates))
+    })
+  })
+
+  describe('Validate on dev', function () {
+    const coordinates = components[0]
+
+    describe('Search definitions', function () {
+      it(`should find definition for ${coordinates}`, async function () {
+        const [foundDef, expectedDef] = await Promise.all([
+          findDefinition(coordinates),
+          getDefinition(devApiBaseUrl, coordinates)
+        ])
+        deepStrictEqual(foundDef, omit(expectedDef, ['files']))
+      })
+    })
+
+    describe('Post to /definitions', function () {
+      it(`should get definition via post to /definitions for ${coordinates}`, async function () {
+        const postDefinitions = callFetch(`${devApiBaseUrl}/definitions`, buildPostOpts([coordinates])).then(r =>
+          r.json()
+        )
+        const [actualDef, expectedDef] = await Promise.all([
+          postDefinitions.then(r => r[coordinates]),
+          getDefinition(devApiBaseUrl, coordinates)
+        ])
+        deepStrictEqual(actualDef, expectedDef)
+      })
+    })
+  })
+})
+
+async function fetchAndCompareDefinition(coordinates) {
+  const [recomputedDef, expectedDef] = await Promise.all([
+    getDefinition(devApiBaseUrl, coordinates, true),
+    getDefinition(prodApiBaseUrl, coordinates)
+  ])
+  compareDefinition(recomputedDef, expectedDef)
+}
+
+async function getDefinition(apiBaseUrl, coordinates, reCompute = false) {
+  reCompute = apiBaseUrl === devApiBaseUrl && reCompute
+  let url = `${apiBaseUrl}/definitions/${coordinates}`
+  if (reCompute) url += '?force=true'
+  return await callFetch(url).then(r => r.json())
+}
+
+function compareDefinition(recomputedDef, expectedDef) {
+  deepStrictEqual(recomputedDef.coordinates, expectedDef.coordinates)
+  compareLicensed(recomputedDef, expectedDef)
+  compareDescribed(recomputedDef, expectedDef)
+  compareFiles(recomputedDef, expectedDef)
+  deepStrictEqual(recomputedDef.score, expectedDef.score)
+}
+
+function compareLicensed(result, expectation) {
+  const actual = omit(result.licensed, ['facets'])
+  const expected = omit(expectation.licensed, ['facets'])
+  deepStrictEqual(actual, expected)
+}
+
+function compareDescribed(result, expectation) {
+  const actual = omit(result.described, ['tools'])
+  const expected = omit(expectation.described, ['tools'])
+  deepStrictEqual(actual, expected)
+}
+
+function compareFiles(result, expectation) {
+  const resultFiles = filesToMap(result)
+  const expectedFiles = filesToMap(expectation)
+  const extraInResult = result.files.filter(f => !expectedFiles.has(f.path))
+  const missingInResult = expectation.files.filter(f => !resultFiles.has(f.path))
+  const differentEntries = result.files.filter(f => expectedFiles.has(f.path) && !isEqual(expectedFiles.get(f.path), f))
+
+  const differences = [...extraInResult, ...missingInResult, ...differentEntries]
+  differences.forEach(f => logDifferences(expectedFiles.get(f.path), resultFiles.get(f.path)))
+
+  strictEqual(missingInResult.length, 0, 'Some files are missing in the result')
+  strictEqual(extraInResult.length, 0, 'There are extra files in the result')
+  strictEqual(differentEntries.length, 0, 'Some files are different between the result and the expectation')
+}
+
+function logDifferences(expected, actual) {
+  console.log('-------------------')
+  console.log(`expected: ${JSON.stringify(expected || {})}`)
+  console.log(`actual:   ${JSON.stringify(actual || {})}`)
+}
+
+function filesToMap(result) {
+  return new Map(result.files.map(f => [f.path, f]))
+}
+
+async function findDefinition(coordinates) {
+  const [type, provider, namespace, name, revision] = coordinates.split('/')
+  const response = await callFetch(
+    `${devApiBaseUrl}/definitions?type=${type}&provider=${provider}&namespace=${namespace}&name=${name}&sortDesc=true&sort=revision`
+  ).then(r => r.json())
+  return response.data.find(d => d.coordinates.revision === revision)
+}
diff --git a/tools/integration/test/serviceTest.js b/tools/integration/test/serviceTest.js
deleted file mode 100644
index 7e0426f..0000000
--- a/tools/integration/test/serviceTest.js
+++ /dev/null
@@ -1,237 +0,0 @@
-// (c) Copyright 2024, SAP SE and ClearlyDefined contributors. Licensed under the MIT license.
-// SPDX-License-Identifier: MIT
-
-const { omit, isEqual } = require('lodash')
-const { deepStrictEqual, strictEqual, ok } = require('assert')
-const { callFetch, buildPostOpts } = require('../lib/fetch')
-const { devApiBaseUrl, prodApiBaseUrl, components, definition } = require('./testConfig')
-
-describe('Service tests', function () {
-  this.timeout(definition.timeout)
-
-  //Rest a bit to avoid overloading the servers
-  afterEach(() => new Promise(resolve => setTimeout(resolve, definition.timeout / 2)))
-
-  describe('Validation between dev and prod', function () {
-    describe('Validate definitions', function () {
-      components.forEach(coordinates => {
-        it(`should return the same definition as prod for ${coordinates}`, () => fetchAndCompareDefinition(coordinates))
-      })
-    })
-
-    describe('Validate attachments', function () {
-      this.timeout(definition.timeout * 1.5)
-      components.forEach(coordinates => {
-        it(`should have the same attachement as prod for ${coordinates}`, () => fetchAndCompareAttachments(coordinates))
-      })
-    })
-  })
-
-  describe('Validate on dev', function () {
-    const coordinates = components[0]
-
-    describe('Search definitions', function () {
-      it(`should find definition for ${coordinates}`, async function () {
-        const [foundDef, expectedDef] = await Promise.all([
-          findDefinition(coordinates),
-          getDefinition(devApiBaseUrl, coordinates)
-        ])
-        deepStrictEqual(foundDef, omit(expectedDef, ['files']))
-      })
-    })
-
-    describe('Post to /definitions', function () {
-      it(`should get definition via post to /definitions for ${coordinates}`, async function () {
-        const postDefinitions = callFetch(`${devApiBaseUrl}/definitions`, buildPostOpts([coordinates])).then(r =>
-          r.json()
-        )
-        const [actualDef, expectedDef] = await Promise.all([
-          postDefinitions.then(r => r[coordinates]),
-          getDefinition(devApiBaseUrl, coordinates)
-        ])
-        deepStrictEqual(actualDef, expectedDef)
-      })
-    })
-
-    describe('Validate curation', function () {
-      describe('Propose curation', function () {
-        const [type, provider, namespace, name, revision] = coordinates.split('/')
-        const curation = {
-          described: {
-            releaseDate: new Date().toISOString().substring(0, 10) //yyyy-mm-dd
-          }
-        }
-        let prNumber
-
-        before('curate', async function () {
-          const curationResponse = await callFetch(
-            `${devApiBaseUrl}/curations`,
-            buildCurationOpts(coordinates, type, provider, namespace, name, revision, curation)
-          ).then(r => r.json())
-          prNumber = curationResponse.prNumber
-        })
-
-        it('should create the PR via curation', async function () {
-          ok(prNumber)
-        })
-
-        it(`should get the curation by PR via /curations/${coordinates}/pr`, async function () {
-          const fetchedCuration = await callFetch(`${devApiBaseUrl}/curations/${coordinates}/pr/${prNumber}`).then(r =>
-            r.json()
-          )
-          deepStrictEqual(fetchedCuration, curation)
-        })
-
-        it(`should reflect the PR in definition preview via definitions/${coordinates}/pr`, async function () {
-          const curatedDefinition = await callFetch(`${devApiBaseUrl}/definitions/${coordinates}/pr/${prNumber}`).then(
-            r => r.json()
-          )
-          strictEqual(curatedDefinition.described.releaseDate, curation.described.releaseDate)
-        })
-
-        it(`should get of list of PRs for component via /curations/${type}/${provider}/${namespace}/${name}`, async function () {
-          const response = await callFetch(`${devApiBaseUrl}/curations/${type}/${provider}/${namespace}/${name}`).then(
-            r => r.json()
-          )
-          const proposedPR = response.contributions.filter(c => c.prNumber === prNumber)
-          ok(proposedPR)
-        })
-
-        it('should get PRs for components via post /curations', async function () {
-          const revisionlessCoordinates = `${type}/${provider}/${namespace}/${name}`
-          const response = await callFetch(`${devApiBaseUrl}/curations`, buildPostOpts([revisionlessCoordinates])).then(
-            r => r.json()
-          )
-          const proposedPR = response[revisionlessCoordinates].contributions.filter(c => c.prNumber === prNumber)
-          ok(proposedPR)
-        })
-      })
-
-      describe('Merged curation', function () {
-        const curatedCoordinates = 'npm/npmjs/@nestjs/platform-express/6.2.2'
-        const expected = {
-          licensed: {
-            declared: 'Apache-2.0'
-          }
-        }
-        it(`should get merged curation for coordinates via /curations/${curatedCoordinates}`, async function () {
-          const response = await callFetch(`${devApiBaseUrl}/curations/${curatedCoordinates}`).then(r => r.json())
-          deepStrictEqual(response, expected)
-        })
-
-        it(`should reflect merged curation in definition for coordinates ${curatedCoordinates}`, async function () {
-          const curatedDefinition = await getDefinition(devApiBaseUrl, curatedCoordinates, true)
-          deepStrictEqual(curatedDefinition.licensed.declared, expected.licensed.declared)
-        })
-      })
-    })
-  })
-})
-
-function buildCurationOpts(coordinates, type, provider, namespace, name, revision, curation) {
-  const contributionInfo = {
-    type: 'other',
-    summary: `test ${coordinates}`
-  }
-  const patch = {
-    coordinates: { type, provider, namespace, name },
-    revisions: {
-      [revision]: curation
-    }
-  }
-  const curationBody = { contributionInfo, patches: [patch] }
-  return {
-    method: 'PATCH',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(curationBody)
-  }
-}
-
-async function findDefinition(coordinates) {
-  const [type, provider, namespace, name, revision] = coordinates.split('/')
-  const response = await callFetch(
-    `${devApiBaseUrl}/definitions?type=${type}&provider=${provider}&namespace=${namespace}&name=${name}&sortDesc=true&sort=revision`
-  ).then(r => r.json())
-  return response.data.find(d => d.coordinates.revision === revision)
-}
-
-async function fetchAndCompareAttachments(coordinates) {
-  const expectedAttachments = await findAttachments(prodApiBaseUrl, coordinates)
-  for (const sha256 of expectedAttachments) {
-    await compareAttachment(sha256)
-  }
-}
-
-async function findAttachments(apiBaseUrl, coordinates) {
-  const definition = await getDefinition(apiBaseUrl, coordinates)
-  return definition.files.filter(f => f.natures || [].includes('license')).map(f => f.hashes.sha256)
-}
-
-async function compareAttachment(sha256) {
-  const [devAttachment, prodAttachment] = await Promise.all(
-    [callFetch(`${devApiBaseUrl}/attachments/${sha256}`), callFetch(`${prodApiBaseUrl}/attachments/${sha256}`)].map(p =>
-      p.then(r => r.text())
-    )
-  )
-  strictEqual(devAttachment, prodAttachment)
-}
-
-async function fetchAndCompareDefinition(coordinates) {
-  const [recomputedDef, expectedDef] = await Promise.all([
-    getDefinition(devApiBaseUrl, coordinates, true),
-    getDefinition(prodApiBaseUrl, coordinates)
-  ])
-  compareDefinition(recomputedDef, expectedDef)
-}
-
-async function getDefinition(apiBaseUrl, coordinates, reCompute = false) {
-  reCompute = apiBaseUrl === devApiBaseUrl && reCompute
-  let url = `${apiBaseUrl}/definitions/${coordinates}`
-  if (reCompute) url += '?force=true'
-  return await callFetch(url).then(r => r.json())
-}
-
-function compareDefinition(recomputedDef, expectedDef) {
-  deepStrictEqual(recomputedDef.coordinates, expectedDef.coordinates)
-  compareLicensed(recomputedDef, expectedDef)
-  compareDescribed(recomputedDef, expectedDef)
-  compareFiles(recomputedDef, expectedDef)
-  deepStrictEqual(recomputedDef.score, expectedDef.score)
-}
-
-function compareLicensed(result, expectation) {
-  const actual = omit(result.licensed, ['facets'])
-  const expected = omit(expectation.licensed, ['facets'])
-  deepStrictEqual(actual, expected)
-}
-
-function compareDescribed(result, expectation) {
-  const actual = omit(result.described, ['tools'])
-  const expected = omit(expectation.described, ['tools'])
-  deepStrictEqual(actual, expected)
-}
-
-function compareFiles(result, expectation) {
-  const resultFiles = filesToMap(result)
-  const expectedFiles = filesToMap(expectation)
-  const extraInResult = result.files.filter(f => !expectedFiles.has(f.path))
-  const missingInResult = expectation.files.filter(f => !resultFiles.has(f.path))
-  const differentEntries = result.files.filter(f => expectedFiles.has(f.path) && !isEqual(expectedFiles.get(f.path), f))
-
-  const differences = [...extraInResult, ...missingInResult, ...differentEntries]
-  differences.forEach(f => logDifferences(expectedFiles.get(f.path), resultFiles.get(f.path)))
-
-  strictEqual(missingInResult.length, 0, 'Some files are missing in the result')
-  strictEqual(extraInResult.length, 0, 'There are extra files in the result')
-  strictEqual(differentEntries.length, 0, 'Some files are different between the result and the expectation')
-}
-
-function logDifferences(expected, actual) {
-  console.log('-------------------')
-  console.log(`expected: ${JSON.stringify(expected || {})}`)
-  console.log(`actual:   ${JSON.stringify(actual || {})}`)
-}
-
-function filesToMap(result) {
-  return new Map(result.files.map(f => [f.path, f]))
-}