diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index aa4febc303..4afb12e638 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -211,17 +211,6 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
                 this.mappingJackson2HttpMessageConverter);
     }
 
-    @BeforeClass
-    public static void beforeWebTestClass() throws Exception {
-
-    }
-
-    @AfterClass
-    public static void afterWebTestClass() throws Exception {
-        Mockito.clearAllCaches();
-    }
-
-
     @Before
     public void setupWebTest() throws Exception {
         log.debug("Executing web test setup");
diff --git a/application/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties
index a4bedd9527..ad86ff736b 100644
--- a/application/src/test/resources/application-test.properties
+++ b/application/src/test/resources/application-test.properties
@@ -67,4 +67,3 @@ sql.ttl.audit_logs.ttl=2592000
 
 sql.edge_events.partition_size=168
 sql.ttl.edge_events.edge_event_ttl=2592000
-spring.test.context.cache.maxSize=1
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7d6b59f10b..f9c06cba93 100755
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
                     <version>${surefire.version}</version>
                     <configuration>
                         <argLine>
-                            --illegal-access=permit -Xss384k -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
+                            --illegal-access=permit -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
                         </argLine>
                     </configuration>
                 </plugin>