diff --git a/src/modules/licence-import/controller.js b/src/modules/licence-import/controller.js
index bf9c9c80..ba95e1fb 100644
--- a/src/modules/licence-import/controller.js
+++ b/src/modules/licence-import/controller.js
@@ -20,7 +20,14 @@ const postImport = async (request, h) => {
 }
 
 const postImportCompany = async (request, h) => {
-  const message = ImportCompanyJob.createMessage(request.query.regionCode, request.query.partyId)
+  const { regionCode, partyId } = request.query
+  const data = {
+    regionCode,
+    partyId,
+    jobNumber: 1,
+    numberOfJobs: 1
+  }
+  const message = ImportCompanyJob.createMessage(data)
 
   try {
     await request.server.messageQueue.deleteQueue(ImportCompanyJob.name)
@@ -33,7 +40,13 @@ const postImportCompany = async (request, h) => {
 }
 
 const postImportLicence = async (request, h) => {
-  const message = ImportLicenceJob.createMessage(request.query.licenceNumber)
+  const { licenceNumber } = request.query
+  const data = {
+    licenceNumber,
+    jobNumber: 1,
+    numberOfJobs: 1
+  }
+  const message = ImportLicenceJob.createMessage(data)
 
   try {
     await request.server.messageQueue.deleteQueue(ImportLicenceJob.name)
diff --git a/src/modules/licence-import/jobs/import-company.js b/src/modules/licence-import/jobs/import-company.js
index e5a990a0..3fe537cc 100644
--- a/src/modules/licence-import/jobs/import-company.js
+++ b/src/modules/licence-import/jobs/import-company.js
@@ -14,22 +14,29 @@ const options = {
 }
 
 /**
- * Formats arguments to publish a PG boss event to import company
+ * Data needed by the import company handler to process the job
  *
- * @param {Number} regionCode - NALD region code
- * @param {Number} partyId - NALD party ID
+ * This is a convention with PGBoss. A number of the jobs/handlers implement a `createMessage()` function which returns
+ * a data object that will be used to queue the job. When it then gets processed the data object is passed to the
+ * handler.
  *
- * @return {Object}
+ * It may also contain non-default config to be used by PGBoss when adding the job, for example, the use of
+ * `singletonKey` in this job.
+ *
+ * @param {Object} data - information needed for the handler to complete the job
+ * @param {Object.string} data.regionCode - region Code from NALD_PARTIES
+ * @param {Object.string} data.partyId - id from NALD_PARTIES
+ * @param {Object.number} data.jobNumber - index position of this job from all jobs when added to the queue
+ * @param {Object.number} data.numberOfJobs - total number of import-company jobs queued in this session
+ *
+ * @return {Object} the message object used by the handler to process the job
  */
-function createMessage (regionCode, partyId) {
+function createMessage (data) {
   return {
     name: JOB_NAME,
-    data: {
-      regionCode,
-      partyId
-    },
+    data,
     options: {
-      singletonKey: `${JOB_NAME}.${regionCode}.${partyId}`,
+      singletonKey: `${JOB_NAME}.${data.regionCode}.${data.partyId}`,
       expireIn: '1 hours'
     }
   }
@@ -37,6 +44,20 @@ function createMessage (regionCode, partyId) {
 
 async function handler (job) {
   try {
+    // Most 'jobs' are single operation things in the licence import process, for example, delete any removed documents
+    // or import the purposes types. However, there are typically 69K instances of this job queued up as part of the
+    // process! Previously, we logged every instance hence this was a primary offender in adding noise to the logs. We
+    // removed that logging but that leaves us with no way of confirming the job is running. So, instead we get
+    // src/modules/licence-import/jobs/queue-companies.js to include details on how many jobs are queued and when each
+    // one was added to the queue. We then use this information to log when the first is picked up and the last.
+    //
+    // N.B. It's not entirely accurate. If you added logging for all back in you might see the start message appear
+    // after a few jobs and likewise the finished message a few before the end. But it's good enough to give an
+    // indication that the 'jobs' did start and finish.
+    if (job.data.jobNumber === 1) {
+      global.GlobalNotifier.omg(`${JOB_NAME}: started`, { numberOfJobs: job.data.numberOfJobs })
+    }
+
     const { regionCode, partyId } = job.data
 
     // Extract data
diff --git a/src/modules/licence-import/jobs/import-licence.js b/src/modules/licence-import/jobs/import-licence.js
index 64e7e43b..8c6ec859 100644
--- a/src/modules/licence-import/jobs/import-licence.js
+++ b/src/modules/licence-import/jobs/import-licence.js
@@ -11,20 +11,49 @@ const options = {
   teamConcurrency: 1
 }
 
-function createMessage (licenceNumber) {
+/**
+ * Data needed by the import licence handler to process the job
+ *
+ * This is a convention with PGBoss. A number of the jobs/handlers implement a `createMessage()` function which returns
+ * a data object that will be used to queue the job. When it then gets processed the data object is passed to the
+ * handler.
+ *
+ * It may also contain non-default config to be used by PGBoss when adding the job, for example, the use of
+ * `singletonKey` in this job.
+ *
+ * @param {Object} data - information needed for the handler to complete the job
+ * @param {Object.string} data.licenceNumber - reference of the licence to import
+ * @param {Object.number} data.jobNumber - index position of this job from all jobs when added to the queue
+ * @param {Object.number} data.numberOfJobs - total number of import-licence jobs queued in this session
+ *
+ * @return {Object} the message object used by the handler to process the job
+ */
+function createMessage (data) {
   return {
     name: JOB_NAME,
-    data: {
-      licenceNumber
-    },
+    data,
     options: {
-      singletonKey: `${JOB_NAME}.${licenceNumber}`
+      singletonKey: `${JOB_NAME}.${data.licenceNumber}`
     }
   }
 }
 
 async function handler (job) {
   try {
+    // Most 'jobs' are single operation things in the licence import process, for example, delete any removed documents
+    // or import the purposes types. However, there are typically 69K instances of this job queued up as part of the
+    // process! Previously, we logged every instance hence this was a primary offender in adding noise to the logs. We
+    // removed that logging but that leaves us with no way of confirming the job is running. So, instead we get
+    // src/modules/licence-import/jobs/queue-licences.js to include details on how many jobs are queued and when each
+    // one was added to the queue. We then use this information to log when the first is picked up and the last.
+    //
+    // N.B. It's not entirely accurate. If you added logging for all back in you might see the start message appear
+    // after a few jobs and likewise the finished message a few before the end. But it's good enough to give an
+    // indication that the 'jobs' did start and finish.
+    if (job.data.jobNumber === 1) {
+      global.GlobalNotifier.omg(`${JOB_NAME}: started`, { numberOfJobs: job.data.numberOfJobs })
+    }
+
     // Extract data
     const data = await extract.getLicenceData(job.data.licenceNumber)
 
@@ -33,6 +62,10 @@ async function handler (job) {
 
     // Load licence to DB
     await load.licence.loadLicence(mapped)
+
+    if (job.data.jobNumber === job.data.numberOfJobs) {
+      global.GlobalNotifier.omg(`${JOB_NAME}: finished`, { numberOfJobs: job.data.numberOfJobs })
+    }
   } catch (error) {
     global.GlobalNotifier.omfg(`${JOB_NAME}: errored`, error)
     throw error
diff --git a/src/modules/licence-import/jobs/queue-companies.js b/src/modules/licence-import/jobs/queue-companies.js
index 3565afb7..17040b3c 100644
--- a/src/modules/licence-import/jobs/queue-companies.js
+++ b/src/modules/licence-import/jobs/queue-companies.js
@@ -37,9 +37,18 @@ async function handler () {
 async function onComplete (messageQueue, job) {
   if (!job.failed) {
     const { value: parties } = job.data.response
-
-    for (const party of parties) {
-      await messageQueue.publish(ImportCompanyJob.createMessage(party.regionCode, party.partyId))
+    const numberOfJobs = parties.length
+
+    for (const [index, party] of parties.entries()) {
+      // This information is to help us log when the import company jobs start and finish. See
+      // src/modules/licence-import/jobs/import-company.js for more details
+      const data = {
+        regionCode: party.regionCode,
+        partyId: party.partyId,
+        jobNumber: index + 1,
+        numberOfJobs
+      }
+      await messageQueue.publish(ImportCompanyJob.createMessage(data))
     }
   }
 
diff --git a/src/modules/licence-import/jobs/queue-licences.js b/src/modules/licence-import/jobs/queue-licences.js
index e498dfa0..03a10638 100644
--- a/src/modules/licence-import/jobs/queue-licences.js
+++ b/src/modules/licence-import/jobs/queue-licences.js
@@ -31,9 +31,17 @@ async function handler () {
 async function onComplete (messageQueue, job) {
   if (!job.failed) {
     const { value: licences } = job.data.response
-
-    for (const licence of licences) {
-      await messageQueue.publish(ImportLicenceJob.createMessage(licence.LIC_NO))
+    const numberOfJobs = licences.length
+
+    for (const [index, licence] of licences.entries()) {
+      // This information is to help us log when the import licence jobs start and finish. See
+      // src/modules/licence-import/jobs/import-licence.js for more details
+      const data = {
+        licenceNumber: licence.LIC_NO,
+        jobNumber: index + 1,
+        numberOfJobs
+      }
+      await messageQueue.publish(ImportLicenceJob.createMessage(data))
     }
   }
 
diff --git a/src/modules/nald-import/controller.js b/src/modules/nald-import/controller.js
index 1195feba..3d9efced 100644
--- a/src/modules/nald-import/controller.js
+++ b/src/modules/nald-import/controller.js
@@ -96,7 +96,7 @@ const postImportLicence = async (request, h) => {
   const data = {
     licenceNumber,
     jobNumber: 1,
-    numberOfLicences: 1
+    numberOfJobs: 1
   }
   const message = importLicenceJob.createMessage(data)
 
diff --git a/src/modules/nald-import/jobs/import-licence.js b/src/modules/nald-import/jobs/import-licence.js
index 9adacc74..30ae653d 100644
--- a/src/modules/nald-import/jobs/import-licence.js
+++ b/src/modules/nald-import/jobs/import-licence.js
@@ -19,10 +19,10 @@ const options = {
  * It may also contain non-default config to be used by PGBoss when adding the job, for example, the use of
  * `singletonKey` in this job.
  *
- * @param {Object} data information needed for the handler to complete the job
- * @param {Object.string} data.licenceNumber reference of the licence to import
- * @param {Object.number} data.jobNumber index position of all licence numbers when this job was added to the queue
- * @param {Object.number} data.numberOfLicences total number of licences to be imported
+ * @param {Object} data - information needed for the handler to complete the job
+ * @param {Object.string} data.licenceNumber - reference of the licence to import
+ * @param {Object.number} data.jobNumber - index position of all licence numbers when this job was added to the queue
+ * @param {Object.number} data.numberOfJobs - total number of import-licence jobs queued in this session
  *
  * @returns {Object} the message object used by the handler to process the job
  */
@@ -38,34 +38,27 @@ function createMessage (data) {
   }
 }
 
-/**
- * Imports a single licence
- *
- * @param {Object} job
- * @param {String} job.data.licenceNumber
- */
 async function handler (job) {
   try {
     // Most 'jobs' are single operation things in the NALD import process, for example, deal with the NALD zip file or
     // delete any removed documents. However, there are typically 71K instances of this job queued up as part of the
     // process! Previously, we logged every instance hence this was a primary offender in adding noise to the logs. We
     // removed that logging but that leaves us with no way of confirming the job is running. So, instead we get
-    // src/modules/nald-import/jobs/populate-pending-import-complete.js to include details on how many licences there
-    // are to import and when each one was added to the queue. We then use this information to log when the first is
-    // picked up and the last.
+    // src/modules/nald-import/jobs/queue-licences.js to include details on how many jobs are queued and when each one
+    // was added to the queue. We then use this information to log when the first is picked up and the last.
     //
-    // N.B. It's not entirely accurate. If you log all you might see the start message appear after a few jobs and
-    // likewise the finished message a few before the end. But it's good enough to give an indication that the 'jobs'
-    // did start and finish.
+    // N.B. It's not entirely accurate. If you added logging for all back in you might see the start message appear
+    // after a few jobs and likewise the finished message a few before the end. But it's good enough to give an
+    // indication that the 'jobs' did start and finish.
     if (job.data.jobNumber === 1) {
-      global.GlobalNotifier.omg(`${JOB_NAME}: started`, { numberOfLicences: job.data.numberOfLicences })
+      global.GlobalNotifier.omg(`${JOB_NAME}: started`, { numberOfJobs: job.data.numberOfJobs })
     }
 
     // Import the licence
     await licenceLoader.load(job.data.licenceNumber)
 
-    if (job.data.jobNumber === job.data.numberOfLicences) {
-      global.GlobalNotifier.omg(`${JOB_NAME}: finished`, { numberOfLicences: job.data.numberOfLicences })
+    if (job.data.jobNumber === job.data.numberOfJobs) {
+      global.GlobalNotifier.omg(`${JOB_NAME}: finished`, { numberOfJobs: job.data.numberOfJobs })
     }
   } catch (error) {
     global.GlobalNotifier.omfg(`${JOB_NAME}: errored`, job.data, error)
diff --git a/src/modules/nald-import/jobs/queue-licences.js b/src/modules/nald-import/jobs/queue-licences.js
index 6b135e61..918d925d 100644
--- a/src/modules/nald-import/jobs/queue-licences.js
+++ b/src/modules/nald-import/jobs/queue-licences.js
@@ -33,7 +33,7 @@ async function handler () {
 async function onComplete (messageQueue, job) {
   if (!job.failed) {
     const { licenceNumbers } = job.data.response
-    const numberOfLicences = licenceNumbers.length
+    const numberOfJobs = licenceNumbers.length
 
     for (const [index, licenceNumber] of licenceNumbers.entries()) {
       // This information is to help us log when the import licence jobs start and finish. See
@@ -41,7 +41,7 @@ async function onComplete (messageQueue, job) {
       const data = {
         licenceNumber,
         jobNumber: index + 1,
-        numberOfLicences
+        numberOfJobs
       }
       await messageQueue.publish(ImportLicenceJob.createMessage(data))
     }
diff --git a/test/modules/licence-import/controller.test.js b/test/modules/licence-import/controller.test.js
index 02fd1c5b..011eec4d 100644
--- a/test/modules/licence-import/controller.test.js
+++ b/test/modules/licence-import/controller.test.js
@@ -103,7 +103,7 @@ experiment('modules/licence-import/controller.js', () => {
 
         expect(message).to.equal({
           name: 'licence-import.import-company',
-          data: { regionCode: 1, partyId: 37760 },
+          data: { regionCode: 1, partyId: 37760, jobNumber: 1, numberOfJobs: 1 },
           options: { singletonKey: 'licence-import.import-company.1.37760', expireIn: '1 hours' }
         })
       })
@@ -139,7 +139,7 @@ experiment('modules/licence-import/controller.js', () => {
 
         expect(message).to.equal({
           name: 'licence-import.import-licence',
-          data: { licenceNumber: '01/123' },
+          data: { licenceNumber: '01/123', jobNumber: 1, numberOfJobs: 1 },
           options: { singletonKey: 'licence-import.import-licence.01/123' }
         })
       })
diff --git a/test/modules/licence-import/jobs/import-company.test.js b/test/modules/licence-import/jobs/import-company.test.js
index f4cb5548..ef87cfc3 100644
--- a/test/modules/licence-import/jobs/import-company.test.js
+++ b/test/modules/licence-import/jobs/import-company.test.js
@@ -41,15 +41,25 @@ experiment('Licence Import: Import Company job', () => {
     delete global.GlobalNotifier
   })
 
+  experiment('.options', () => {
+    test('has teamSize set to 75', async () => {
+      expect(ImportCompanyJob.options.teamSize).to.equal(75)
+    })
+
+    test('has teamConcurrency set to 1', async () => {
+      expect(ImportCompanyJob.options.teamConcurrency).to.equal(1)
+    })
+  })
+
   experiment('.createMessage', () => {
     test('formats a message for PG boss', async () => {
-      const message = ImportCompanyJob.createMessage(regionCode, partyId)
+      const data = { regionCode, partyId, jobNumber: 1, numberOfJobs: 1 }
+      const message = ImportCompanyJob.createMessage(data)
 
       expect(message).to.equal({
         name: 'licence-import.import-company',
         data: {
-          regionCode: 1,
-          partyId: 37760
+          ...data
         },
         options: {
           singletonKey: 'licence-import.import-company.1.37760',
@@ -62,29 +72,60 @@ experiment('Licence Import: Import Company job', () => {
   experiment('.handler', () => {
     let job
 
-    beforeEach(() => {
-      job = { data: { regionCode: '1', partyId: '101' } }
-    })
-
     experiment('when the job is successful', () => {
-      test('a message is NOT logged', async () => {
-        await ImportCompanyJob.handler(job)
+      experiment('and this is the first licence to be imported', () => {
+        beforeEach(() => {
+          job = { data: { regionCode: '1', partyId: '101', jobNumber: 1, numberOfJobs: 10 } }
+        })
 
-        expect(notifierStub.omg.called).to.be.false()
-      })
+        test("a 'started' message is logged", async () => {
+          await ImportCompanyJob.handler(job)
 
-      test('extracts the company data, transforms it then loads it into the CRM DB', async () => {
-        await ImportCompanyJob.handler(job)
+          const [message] = notifierStub.omg.lastCall.args
 
-        expect(extract.getCompanyData.called).to.equal(true)
-        expect(transform.company.transformCompany.called).to.equal(true)
-        expect(load.company.loadCompany.called).to.equal(true)
+          expect(message).to.equal('licence-import.import-company: started')
+          expect(notifierStub.omg.called).to.be.true()
+        })
+
+        test('extracts the company data, transforms it then loads it into the CRM DB', async () => {
+          await ImportCompanyJob.handler(job)
+
+          expect(extract.getCompanyData.called).to.equal(true)
+          expect(transform.company.transformCompany.called).to.equal(true)
+          expect(load.company.loadCompany.called).to.equal(true)
+        })
+
+        test('sets the import status of the water.import_company record', async () => {
+          await ImportCompanyJob.handler(job)
+
+          expect(importCompaniesConnector.setImportedStatus.called).to.equal(true)
+        })
       })
 
-      test('sets the import status of the water.import_company record', async () => {
-        await ImportCompanyJob.handler(job)
+      experiment('and this is one of a number of licences to be imported', () => {
+        beforeEach(() => {
+          job = { data: { regionCode: '1', partyId: '101', jobNumber: 2, numberOfJobs: 10 } }
+        })
+
+        test('a message is NOT logged', async () => {
+          await ImportCompanyJob.handler(job)
+
+          expect(notifierStub.omg.called).to.be.false()
+        })
+
+        test('extracts the company data, transforms it then loads it into the CRM DB', async () => {
+          await ImportCompanyJob.handler(job)
+
+          expect(extract.getCompanyData.called).to.equal(true)
+          expect(transform.company.transformCompany.called).to.equal(true)
+          expect(load.company.loadCompany.called).to.equal(true)
+        })
+
+        test('sets the import status of the water.import_company record', async () => {
+          await ImportCompanyJob.handler(job)
 
-        expect(importCompaniesConnector.setImportedStatus.called).to.equal(true)
+          expect(importCompaniesConnector.setImportedStatus.called).to.equal(true)
+        })
       })
     })
 
diff --git a/test/modules/licence-import/jobs/import-licence.test.js b/test/modules/licence-import/jobs/import-licence.test.js
index d5147126..44af4dd4 100644
--- a/test/modules/licence-import/jobs/import-licence.test.js
+++ b/test/modules/licence-import/jobs/import-licence.test.js
@@ -38,14 +38,25 @@ experiment('Licence Import: Import Licence job', () => {
     delete global.GlobalNotifier
   })
 
+  experiment('.options', () => {
+    test('has teamSize set to 75', async () => {
+      expect(ImportLicenceJob.options.teamSize).to.equal(75)
+    })
+
+    test('has teamConcurrency set to 1', async () => {
+      expect(ImportLicenceJob.options.teamConcurrency).to.equal(1)
+    })
+  })
+
   experiment('.createMessage', () => {
     test('formats a message for PG boss', async () => {
-      const message = ImportLicenceJob.createMessage(licenceNumber)
+      const data = { licenceNumber, jobNumber: 1, numberOfJobs: 1 }
+      const message = ImportLicenceJob.createMessage(data)
 
       expect(message).to.equal({
         name: 'licence-import.import-licence',
         data: {
-          licenceNumber: '01/123'
+          ...data
         },
         options: {
           singletonKey: 'licence-import.import-licence.01/123'
@@ -57,23 +68,77 @@ experiment('Licence Import: Import Licence job', () => {
   experiment('.handler', () => {
     let job
 
-    beforeEach(() => {
-      job = { data: { licenceNumber: '01/123' } }
-    })
-
     experiment('when the job is successful', () => {
-      test('a message is NOT logged', async () => {
-        await ImportLicenceJob.handler(job)
+      experiment('and this is the first licence to be imported', () => {
+        beforeEach(() => {
+          job = {
+            data: { licenceNumber: '01/123', jobNumber: 1, numberOfJobs: 10 }
+          }
+        })
+
+        test("a 'started' message is logged", async () => {
+          await ImportLicenceJob.handler(job)
+
+          const [message] = notifierStub.omg.lastCall.args
+
+          expect(message).to.equal('licence-import.import-licence: started')
+          expect(notifierStub.omg.called).to.be.true()
+        })
+
+        test('extracts the licence data, transforms it then loads it into the DB', async () => {
+          await ImportLicenceJob.handler(job)
 
-        expect(notifierStub.omg.called).to.be.false()
+          expect(extract.getLicenceData.called).to.equal(true)
+          expect(transform.licence.transformLicence.called).to.equal(true)
+          expect(load.licence.loadLicence.called).to.equal(true)
+        })
       })
 
-      test('extracts the licence data, transforms it then loads it into the DB', async () => {
-        await ImportLicenceJob.handler(job)
+      experiment('and this is one of a number of licences to be imported', () => {
+        beforeEach(() => {
+          job = {
+            data: { licenceNumber: '01/123', jobNumber: 2, numberOfJobs: 10 }
+          }
+        })
+
+        test('a message is NOT logged', async () => {
+          await ImportLicenceJob.handler(job)
+
+          expect(notifierStub.omg.called).to.be.false()
+        })
+
+        test('extracts the licence data, transforms it then loads it into the DB', async () => {
+          await ImportLicenceJob.handler(job)
+
+          expect(extract.getLicenceData.called).to.equal(true)
+          expect(transform.licence.transformLicence.called).to.equal(true)
+          expect(load.licence.loadLicence.called).to.equal(true)
+        })
+      })
+
+      experiment('and this is the last licence to be imported', () => {
+        beforeEach(() => {
+          job = {
+            data: { licenceNumber: '01/123', jobNumber: 10, numberOfJobs: 10 }
+          }
+        })
+
+        test("a 'finished' message is logged", async () => {
+          await ImportLicenceJob.handler(job)
+
+          const [message] = notifierStub.omg.lastCall.args
+          expect(message).to.equal('licence-import.import-licence: finished')
+
+          expect(notifierStub.omg.called).to.be.true()
+        })
+
+        test('extracts the licence data, transforms it then loads it into the DB', async () => {
+          await ImportLicenceJob.handler(job)
 
-        expect(extract.getLicenceData.called).to.equal(true)
-        expect(transform.licence.transformLicence.called).to.equal(true)
-        expect(load.licence.loadLicence.called).to.equal(true)
+          expect(extract.getLicenceData.called).to.equal(true)
+          expect(transform.licence.transformLicence.called).to.equal(true)
+          expect(load.licence.loadLicence.called).to.equal(true)
+        })
       })
     })
 
diff --git a/test/modules/licence-import/jobs/queue-companies.test.js b/test/modules/licence-import/jobs/queue-companies.test.js
index 447fcef9..dc4d7284 100644
--- a/test/modules/licence-import/jobs/queue-companies.test.js
+++ b/test/modules/licence-import/jobs/queue-companies.test.js
@@ -143,7 +143,7 @@ experiment('Licence Import: Queue Companies job', () => {
 
         const jobMessage = messageQueue.publish.firstCall.args[0]
 
-        expect(jobMessage.data).to.equal({ regionCode: 1, partyId: 37760 })
+        expect(jobMessage.data).to.equal({ regionCode: 1, partyId: 37760, jobNumber: 1, numberOfJobs: 2 })
       })
 
       test('the import company job is published to the queue for the second company', async () => {
@@ -151,7 +151,7 @@ experiment('Licence Import: Queue Companies job', () => {
 
         const jobMessage = messageQueue.publish.lastCall.args[0]
 
-        expect(jobMessage.data).to.equal({ regionCode: 1, partyId: 37761 })
+        expect(jobMessage.data).to.equal({ regionCode: 1, partyId: 37761, jobNumber: 2, numberOfJobs: 2 })
       })
 
       experiment('but an error is thrown', () => {
diff --git a/test/modules/licence-import/jobs/queue-licences.js b/test/modules/licence-import/jobs/queue-licences.test.js
similarity index 98%
rename from test/modules/licence-import/jobs/queue-licences.js
rename to test/modules/licence-import/jobs/queue-licences.test.js
index 4d54149c..baefd97b 100644
--- a/test/modules/licence-import/jobs/queue-licences.js
+++ b/test/modules/licence-import/jobs/queue-licences.test.js
@@ -136,7 +136,7 @@ experiment('Licence Import: Queue Licences job', () => {
 
         const jobMessage = messageQueue.publish.firstCall.args[0]
 
-        expect(jobMessage.data).to.equal({ licenceNumber: '01/123' })
+        expect(jobMessage.data).to.equal({ licenceNumber: '01/123', jobNumber: 1, numberOfJobs: 2 })
       })
 
       test('the import licence job is published to the queue for the second licence', async () => {
@@ -144,7 +144,7 @@ experiment('Licence Import: Queue Licences job', () => {
 
         const jobMessage = messageQueue.publish.lastCall.args[0]
 
-        expect(jobMessage.data).to.equal({ licenceNumber: '01/124' })
+        expect(jobMessage.data).to.equal({ licenceNumber: '01/124', jobNumber: 2, numberOfJobs: 2 })
       })
 
       experiment('but an error is thrown', () => {
diff --git a/test/modules/nald-import/controller.test.js b/test/modules/nald-import/controller.test.js
index 9b36e60b..6a55c92d 100644
--- a/test/modules/nald-import/controller.test.js
+++ b/test/modules/nald-import/controller.test.js
@@ -52,7 +52,7 @@ experiment('modules/nald-import/controller', () => {
         const [message] = request.server.messageQueue.publish.lastCall.args
         expect(message).to.equal({
           name: 'nald-import.import-licence',
-          data: { licenceNumber: 'test-licence', jobNumber: 1, numberOfLicences: 1 },
+          data: { licenceNumber: 'test-licence', jobNumber: 1, numberOfJobs: 1 },
           options: { singletonKey: 'test-licence' }
         })
       })
diff --git a/test/modules/nald-import/jobs/import-licence.test.js b/test/modules/nald-import/jobs/import-licence.test.js
index a4a48c55..9605e71b 100644
--- a/test/modules/nald-import/jobs/import-licence.test.js
+++ b/test/modules/nald-import/jobs/import-licence.test.js
@@ -44,7 +44,7 @@ experiment('NALD Import: Import Licence job', () => {
 
   experiment('.createMessage', () => {
     test('formats a message for PG boss', async () => {
-      const data = { licenceNumber: 'test-licence-number', jobNumber: 1, numberOfLicences: 1 }
+      const data = { licenceNumber: 'test-licence-number', jobNumber: 1, numberOfJobs: 1 }
       const job = ImportLicenceJob.createMessage(data)
 
       expect(job).to.equal({
@@ -64,7 +64,7 @@ experiment('NALD Import: Import Licence job', () => {
       experiment('and this is the first licence to be imported', () => {
         beforeEach(async () => {
           job = {
-            data: { licenceNumber: 'test-licence-number', jobNumber: 1, numberOfLicences: 10 }
+            data: { licenceNumber: 'test-licence-number', jobNumber: 1, numberOfJobs: 10 }
           }
         })
 
@@ -87,7 +87,7 @@ experiment('NALD Import: Import Licence job', () => {
       experiment('and this is one of a number of licences to be imported', () => {
         beforeEach(async () => {
           job = {
-            data: { licenceNumber: 'test-licence-number', jobNumber: 2, numberOfLicences: 10 }
+            data: { licenceNumber: 'test-licence-number', jobNumber: 2, numberOfJobs: 10 }
           }
         })
 
@@ -107,7 +107,7 @@ experiment('NALD Import: Import Licence job', () => {
       experiment('and this is the last licence to be imported', () => {
         beforeEach(async () => {
           job = {
-            data: { licenceNumber: 'test-licence-number', jobNumber: 10, numberOfLicences: 10 }
+            data: { licenceNumber: 'test-licence-number', jobNumber: 10, numberOfJobs: 10 }
           }
         })
 
@@ -133,7 +133,7 @@ experiment('NALD Import: Import Licence job', () => {
 
       const job = {
         name: 'nald-import.import-licence',
-        data: { licenceNumber: 'test-licence-number', jobNumber: 2, numberOfLicences: 10 }
+        data: { licenceNumber: 'test-licence-number', jobNumber: 2, numberOfJobs: 10 }
       }
 
       beforeEach(async () => {
diff --git a/test/modules/nald-import/jobs/queue-licences.test.js b/test/modules/nald-import/jobs/queue-licences.test.js
index f4ed3df0..865a4b1d 100644
--- a/test/modules/nald-import/jobs/queue-licences.test.js
+++ b/test/modules/nald-import/jobs/queue-licences.test.js
@@ -144,7 +144,7 @@ experiment('NALD Import: Queue Licences job', () => {
 
         const jobMessage = messageQueue.publish.firstCall.args[0]
 
-        expect(jobMessage.data).to.equal({ licenceNumber: 'licence-1', jobNumber: 1, numberOfLicences: 2 })
+        expect(jobMessage.data).to.equal({ licenceNumber: 'licence-1', jobNumber: 1, numberOfJobs: 2 })
       })
 
       test('the import licence job is published to the queue for the second licence', async () => {
@@ -152,7 +152,7 @@ experiment('NALD Import: Queue Licences job', () => {
 
         const jobMessage = messageQueue.publish.lastCall.args[0]
 
-        expect(jobMessage.data).to.equal({ licenceNumber: 'licence-2', jobNumber: 2, numberOfLicences: 2 })
+        expect(jobMessage.data).to.equal({ licenceNumber: 'licence-2', jobNumber: 2, numberOfJobs: 2 })
       })
 
       experiment('but an error is thrown', () => {