diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a6bb70cc..cb6aeb1b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,6 +67,7 @@ jobs:
           -Dsonar.projectKey=cassproject_CASS
           -Dsonar.organization=cassproject
           -Dsonar.sources=src/main/
+          -Dsonar.tests=src/test/
         projectBaseDir: .
 
     - name: Perform CodeQL Analysis
diff --git a/src/main/server/adapter/asn/asn.test.js b/src/test/asn.test.js
similarity index 100%
rename from src/main/server/adapter/asn/asn.test.js
rename to src/test/asn.test.js
diff --git a/src/main/server/adapter/case/case.test.js b/src/test/case.test.js
similarity index 100%
rename from src/main/server/adapter/case/case.test.js
rename to src/test/case.test.js
diff --git a/src/main/server/adapter/ceasn/ceasn.test.js b/src/test/ceasn.test.js
similarity index 92%
rename from src/main/server/adapter/ceasn/ceasn.test.js
rename to src/test/ceasn.test.js
index 37f436444..4838c1d79 100644
--- a/src/main/server/adapter/ceasn/ceasn.test.js
+++ b/src/test/ceasn.test.js
@@ -1,10 +1,5 @@
-let chai = require("chai");
-const EcCrypto = require("cassproject/src/com/eduworks/ec/crypto/EcCrypto");
 const EcRepository = require("cassproject/src/org/cassproject/ebac/repository/EcRepository");
-const EcIdentityManager = require("cassproject/src/org/cassproject/ebac/identity/EcIdentityManager");
-const EcIdentity = require("cassproject/src/org/cassproject/ebac/identity/EcIdentity");
-const EcPpk = require("cassproject/src/com/eduworks/ec/crypto/EcPpk");
-const fs = require('fs');
+let chai = require("chai");
 
 let hrtime = function() {
     try {
diff --git a/src/main/server/skyRepo.test.js b/src/test/skyRepo.test.js
similarity index 100%
rename from src/main/server/skyRepo.test.js
rename to src/test/skyRepo.test.js