diff --git a/modules/ticket/back/methods/ticket-tracking/setDelivered.js b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
index ac267eb1a..d3cdb192f 100644
--- a/modules/ticket/back/methods/ticket-tracking/setDelivered.js
+++ b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
@@ -47,7 +47,7 @@ module.exports = Self => {
 
             const promises = [];
             for (const id of ticketIds) {
-                const promise = models.TicketTracking.state(ctx, {
+                const promise = await models.Ticket.state(ctx, {
                     stateFk: state.id,
                     workerFk: worker.id,
                     ticketFk: id
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket/specs/state.spec.js
similarity index 89%
rename from modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
rename to modules/ticket/back/methods/ticket/specs/state.spec.js
index b01d02389..9b5e80165 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/state.spec.js
@@ -47,7 +47,7 @@ describe('ticket state()', () => {
             activeCtx.accessToken.userId = salesPersonId;
             const params = {ticketFk: 2, stateFk: 3};
 
-            await models.TicketTracking.state(ctx, params, options);
+            await models.Ticket.state(ctx, params, options);
 
             await tx.rollback();
         } catch (e) {
@@ -69,7 +69,7 @@ describe('ticket state()', () => {
             activeCtx.accessToken.userId = employeeId;
             const params = {ticketFk: 11, stateFk: 13};
 
-            await models.TicketTracking.state(ctx, params, options);
+            await models.Ticket.state(ctx, params, options);
 
             await tx.rollback();
         } catch (e) {
@@ -80,7 +80,8 @@ describe('ticket state()', () => {
         expect(error.code).toBe('ACCESS_DENIED');
     });
 
-    it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => {
+    it('should be able to create a ticket tracking line for a not' +
+        ' editable ticket if the user has the production role', async() => {
         const tx = await models.TicketTracking.beginTransaction({});
 
         try {
@@ -91,7 +92,7 @@ describe('ticket state()', () => {
             activeCtx.accessToken.userId = productionId;
             const params = {ticketFk: ticket.id, stateFk: 3};
 
-            const ticketTracking = await models.TicketTracking.state(ctx, params, options);
+            const ticketTracking = await models.Ticket.state(ctx, params, options);
 
             expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk);
             expect(ticketTracking.__data.stateFk).toBe(params.stateFk);
@@ -105,7 +106,8 @@ describe('ticket state()', () => {
         }
     });
 
-    it('should update the ticket tracking line when the user is salesperson, uses the state assigned and a valid worker id', async() => {
+    it('should update the ticket tracking line when the user is salesperson,' +
+        ' uses the state assigned and a valid worker id', async() => {
         const tx = await models.TicketTracking.beginTransaction({});
 
         try {
@@ -115,7 +117,7 @@ describe('ticket state()', () => {
             const ctx = {req: {accessToken: {userId: 18}}};
             const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
             const params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
-            const res = await models.TicketTracking.state(ctx, params, options);
+            const res = await models.Ticket.state(ctx, params, options);
 
             expect(res.__data.ticketFk).toBe(params.ticketFk);
             expect(res.__data.stateFk).toBe(params.stateFk);
diff --git a/modules/ticket/back/methods/ticket-tracking/state.js b/modules/ticket/back/methods/ticket/state.js
similarity index 100%
rename from modules/ticket/back/methods/ticket-tracking/state.js
rename to modules/ticket/back/methods/ticket/state.js
diff --git a/modules/ticket/back/models/ticket-tracking.js b/modules/ticket/back/models/ticket-tracking.js
index 48e4c93d7..92e046d3e 100644
--- a/modules/ticket/back/models/ticket-tracking.js
+++ b/modules/ticket/back/models/ticket-tracking.js
@@ -1,5 +1,4 @@
 module.exports = function(Self) {
-    require('../methods/ticket-tracking/state')(Self);
     require('../methods/ticket-tracking/setDelivered')(Self);
 
     Self.validatesPresenceOf('stateFk', {message: 'State cannot be blank'});
diff --git a/modules/ticket/back/models/ticket.js b/modules/ticket/back/models/ticket.js
index ea068ef8a..a265c9cbb 100644
--- a/modules/ticket/back/models/ticket.js
+++ b/modules/ticket/back/models/ticket.js
@@ -1,4 +1,5 @@
 module.exports = Self => {
     // Methods
     require('./ticket-methods')(Self);
+    require('../methods/ticket/state')(Self);
 };