diff --git a/test/unit/rest-api/README.md b/test/unit/controllers/rest-api/README.md
similarity index 100%
rename from test/unit/rest-api/README.md
rename to test/unit/controllers/rest-api/README.md
diff --git a/test/unit/rest-api/a02-users.rest-unit.js b/test/unit/controllers/rest-api/a02-users.rest-unit.js
similarity index 94%
rename from test/unit/rest-api/a02-users.rest-unit.js
rename to test/unit/controllers/rest-api/a02-users.rest-unit.js
index b2e7313..ba6e3e8 100644
--- a/test/unit/rest-api/a02-users.rest-unit.js
+++ b/test/unit/controllers/rest-api/a02-users.rest-unit.js
@@ -8,17 +8,17 @@ const sinon = require('sinon')
 const mongoose = require('mongoose')
 
 // Local support libraries
-const config = require('../../../config')
-const testUtils = require('../../utils/test-utils')
-const adapters = require('../mocks/adapters')
-const UseCasesMock = require('../mocks/use-cases')
+const config = require('../../../../config')
+const testUtils = require('../../../utils/test-utils')
+const adapters = require('../../mocks/adapters')
+const UseCasesMock = require('../../mocks/use-cases')
 
-const UserController = require('../../../src/controllers/rest-api/users/controller')
+const UserController = require('../../../../src/controllers/rest-api/users/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Users', () => {
   // const testUser = {}
diff --git a/test/unit/rest-api/a04-contact.rest-api.js b/test/unit/controllers/rest-api/a04-contact.rest-api.js
similarity index 89%
rename from test/unit/rest-api/a04-contact.rest-api.js
rename to test/unit/controllers/rest-api/a04-contact.rest-api.js
index e8c721d..9e30e79 100644
--- a/test/unit/rest-api/a04-contact.rest-api.js
+++ b/test/unit/controllers/rest-api/a04-contact.rest-api.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const ContactController = require('../../../src/controllers/rest-api/contact/controller')
+const ContactController = require('../../../../src/controllers/rest-api/contact/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Contact', () => {
   before(async () => {})
diff --git a/test/unit/rest-api/a06-logapi.rest-unit.js b/test/unit/controllers/rest-api/a06-logapi.rest-unit.js
similarity index 91%
rename from test/unit/rest-api/a06-logapi.rest-unit.js
rename to test/unit/controllers/rest-api/a06-logapi.rest-unit.js
index 700de21..f9ab138 100644
--- a/test/unit/rest-api/a06-logapi.rest-unit.js
+++ b/test/unit/controllers/rest-api/a06-logapi.rest-unit.js
@@ -6,12 +6,12 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const LogsApiController = require('../../../src/controllers/rest-api/logs/controller')
+const LogsApiController = require('../../../../src/controllers/rest-api/logs/controller')
 let uut
 let sandbox
 let ctx
 
-const mockContext = require('../../unit/mocks/ctx-mock').context
+const mockContext = require('../../../unit/mocks/ctx-mock').context
 
 describe('Logapi', () => {
   before(async () => {})