diff --git a/citizen-intelligence-agency/pom.xml b/citizen-intelligence-agency/pom.xml
index 3d40782106..cd00afaf4a 100644
--- a/citizen-intelligence-agency/pom.xml
+++ b/citizen-intelligence-agency/pom.xml
@@ -1683,6 +1683,30 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/UnitTestSuite.java</include>
+            <include>**/IntegrationTestSuite.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/*$*</exclude>
+          </excludes>
+          <systemPropertyVariables>
+            <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
+          </systemPropertyVariables>
+          <argLine>
+            --add-opens java.base/java.lang=ALL-UNNAMED
+            --add-opens java.base/java.util=ALL-UNNAMED
+            --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+            -Xmx2048m
+          </argLine>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <reporting>
diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java
index 74279994c5..53061f27cf 100644
--- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java
+++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java
@@ -4,8 +4,24 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+import com.hack23.cia.web.impl.ui.application.CitizenIntelligenceAgencyHealthCheckServletTest;
 import com.hack23.cia.web.impl.ui.application.util.UserContextUtilTest;
-import com.hack23.cia.web.impl.ui.application.util.WebBrowserUtilTest;
+import com.hack23.cia.web.impl.ui.application.views.common.converters.ListPropertyConverterTest;
+import com.hack23.cia.web.impl.ui.application.views.common.formfactory.impl.StringToEnumConverterTest;
+import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.impl.StreamSourceImplementationTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.ComplianceCheckPageItemRendererClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.DecisionFlowValueChangeListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.DeleteAccountClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.DisableGoogleAuthenticatorCredentialClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.LogoutClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.ManageUserAccountClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.RemoveDataClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.RuleViolationPageItemRendererClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.SearchDocumentClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.SendEmailClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.UpdateApplicationConfigurationClickListenerTest;
+import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.UpdateSearchIndexClickListenerTest;
 
 /**
  * The Class IntegrationTestSuite.
@@ -13,9 +29,24 @@
 @RunWith(Suite.class)
 @DisplayName("CIA Unit Tests")
 @Suite.SuiteClasses({
-    UserContextUtilTest.class,
-    WebBrowserUtilTest.class
-})
+    CitizenIntelligenceAgencyHealthCheckServletTest.class,
+    UpdateSearchIndexClickListenerTest.class,
+    ManageUserAccountClickListenerTest.class,
+    SendEmailClickListenerTest.class,
+    RuleViolationPageItemRendererClickListenerTest.class,
+    DisableGoogleAuthenticatorCredentialClickListenerTest.class,
+    DecisionFlowValueChangeListenerTest.class,
+    SearchDocumentClickListenerTest.class,
+    DeleteAccountClickListenerTest.class,
+    UpdateApplicationConfigurationClickListenerTest.class,
+    RemoveDataClickListenerTest.class,
+    ComplianceCheckPageItemRendererClickListenerTest.class,
+    LogoutClickListenerTest.class,
+    PageItemPropertyClickListenerTest.class,
+    StringToEnumConverterTest.class,
+    StreamSourceImplementationTest.class,
+    ListPropertyConverterTest.class,
+    UserContextUtilTest.class})
 public class UnitTestSuite {
 		
 }